lkml.org 
[lkml]   [2018]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 165/190] Kbuild: provide a __UNIQUE_ID for clang
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Arnd Bergmann <arnd@arndb.de>

    commit b41c29b0527c7fd6a95d0f71274abb79933bf960 upstream.

    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>
    Cc: Matthias Kaehlcke <mka@google.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    include/linux/compiler-clang.h | 5 +++++
    1 file changed, 5 insertions(+)

    --- 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__)

    \
     
     \ /
      Last update: 2018-04-11 22:26    [W:2.181 / U:0.128 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site