From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753904AbcBHOjM (ORCPT ); Mon, 8 Feb 2016 09:39:12 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:65294 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751691AbcBHOjK (ORCPT ); Mon, 8 Feb 2016 09:39:10 -0500 From: Arnd Bergmann To: Michal Marek Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Mark Charlebois , Behan Webster , linux-kernel@vger.kernel.org Subject: [PATCH] Kbuild: provide a __UNIQUE_ID for clang Date: Mon, 8 Feb 2016 15:38:32 +0100 Message-Id: <1454942318-2782493-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:Sq17UMrhOZwY+e7IakK/zm13XRsd9Bl7TxMoshjZCmYu78iuhOI QI3pWEn+m56geSx9YQhPTROuXsvM72IdcDVaMHLs6zfavtszs4Q8wqvdj8XR6OG/rmammdj +NB+AZ+7ggKfR4VWD8TTQvlcdYDtn7y8K0B5SwSYvGpRl+N+HkuvFkLLg8Uk2HFK+vYdUKf /4zip8U5gjzUxbvHSNJBg== X-UI-Out-Filterresults: notjunk:1;V01:K0:rm0qRhfdJ9Y=:bQBb9rOb0aCNJVsxzaUNK9 v2AzTx1MVwbVqrHbEwgwacIP5kY++NvgKzIXt2QS9m8GaWWZIZRIqf9sh0c5eFoR5NK96GMCb bun9cA9hioexoR+wexyMJmj7E4XUOF7mkKzuWJiBLfqvhBiK3Km91qSK6psg2K7bNyaCFnxsf 4R5rqc+mRfszQO0ENhlYVlvbdHxfFgyVz78BChWyPRyMzFeOZ+KBle25WQKqMzvoD0bfQl2tb /7LUvWrDCq7x8GK9XDtxlDg0tEav4042Ba7TEcoqN3RfirvGw96+TJ992IsahFZZgP3oU/Mip iJmrRl5HbP/v388M4B1cjoXTau5xHxwD2JDCw3Wec+2w9HijNkkUoWY5EKK3gWWLCYr9TN6kX sgkG2Kvz7yCVpClFR7VKeeeLk+KZo7LNtjkZ17rQsK/ODNsDCMFwz3ZXXR+KZNvMCULnu3pzq p8Z308lvpRWJcQXqq7xRl9+5W2e4DHt2iFmDk5DFz7rJw2S53NDduahD8hBP+WDVnpg7VbqkR pmUOb2PiiIZR6IiUUo9iWSRRoJfEyP6a9xdVVvwBtuGxthNn3pwW8sfUn15wfBQk4jQkK0UP4 e/sv/s4Z3BSocgzYwj1H5BsLG9BbjCFQXVKGFM2rAZuBSHPIpyBLx21FkxQh3eNl/hs6njvxF l/TlFEPBiCeGLQSyZCnrXfI03wqNPCZlgPSLYmlIKrlB7fVlnDBAPnT83b+4nmR8ufxg= Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The default __UNIQUE_ID macro in compiler.h fails to work for some drivers: drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c:615:1: error: redefinition of '__UNIQUE_ID_firmware615' BRCMF_FW_NVRAM_DEF(4354, "brcmfmac4354-sdio.bin", "brcmfmac4354-sdio.txt"); This adds a copy of the version we use for gcc-4.3 and higher, as the same one works with all versions of clang that I could find in svn (2.6 and higher). Signed-off-by: Arnd Bergmann --- include/linux/compiler-clang.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/linux/compiler-clang.h b/include/linux/compiler-clang.h index d1e49d52b640..de179993e039 100644 --- a/include/linux/compiler-clang.h +++ b/include/linux/compiler-clang.h @@ -10,3 +10,8 @@ #undef uninitialized_var #define uninitialized_var(x) x = *(&(x)) #endif + +/* same as gcc, this was present in clang-2.6 so we can assume it works + * with any version that can compile the kernel + */ +#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__) -- 2.7.0