diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-02-08 15:38:32 +0100 |
|---|---|---|
| committer | Michal Marek <mmarek@suse.com> | 2016-02-08 19:04:55 +0100 |
| commit | b41c29b0527c7fd6a95d0f71274abb79933bf960 (patch) | |
| tree | 5dd24f13da8d627a07fdf42270dd5fcd08840361 | |
| parent | 5399eb9b39081d6d2fc1a13d4ea85f1ceb2c8b44 (diff) | |
| download | linux-stable-b41c29b0527c7fd6a95d0f71274abb79933bf960.tar.gz linux-stable-b41c29b0527c7fd6a95d0f71274abb79933bf960.tar.bz2 linux-stable-b41c29b0527c7fd6a95d0f71274abb79933bf960.zip | |
Kbuild: provide a __UNIQUE_ID for clang
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 <arnd@arndb.de>
Signed-off-by: Michal Marek <mmarek@suse.com>
| -rw-r--r-- | include/linux/compiler-clang.h | 5 |
1 files changed, 5 insertions, 0 deletions
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__) |