[lkml]   [2009]   [Sep]   [20]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
    Patch in this message
    Subject[PATCH v4 1/4] kbuild: Don't define ALIGN and ENTRY when preprocessing linker scripts.
    Adding a reference to <linux/linkage.h> to x86's <asm/cache.h> causes
    the x86 linker script to have syntax errors, because the ALIGN and
    ENTRY keywords get redefined to the assembly implementations of those.
    One could fix this by adjusting the include structure, but I think any
    solution based on that approach would be fragile.

    Currently, it is impossible when writing a header to do something
    different for assembly files and linker scripts, even though there are
    clearly cases where one wants them to define macros differently for
    the two (ENTRY being an excellent example). So I think the right
    solution here is to introduce a new preprocessor definition,
    tentatively called LINKER_SCRIPT that is set along with __ASSEMBLY__
    for linker scripts, and to use that to not define ALIGN and ENTRY in
    linker scripts. I suspect we'll find other uses for this mechanism in
    the future.

    Signed-off-by: Tim Abbott <>
    Cc: Sam Ravnborg <>
    include/linux/linkage.h | 2 ++
    scripts/ | 2 +-
    2 files changed, 3 insertions(+), 1 deletions(-)

    diff --git a/include/linux/linkage.h b/include/linux/linkage.h
    index 691f591..5126cce 100644
    --- a/include/linux/linkage.h
    +++ b/include/linux/linkage.h
    @@ -57,6 +57,7 @@

    #ifdef __ASSEMBLY__

    +#ifndef LINKER_SCRIPT
    #define ALIGN __ALIGN
    #define ALIGN_STR __ALIGN_STR

    @@ -66,6 +67,7 @@
    ALIGN; \
    +#endif /* LINKER_SCRIPT */

    #ifndef WEAK
    #define WEAK(name) \
    diff --git a/scripts/ b/scripts/
    index d542566..341b589 100644
    --- a/scripts/
    +++ b/scripts/
    @@ -271,7 +271,7 @@ targets += $(extra-y) $(MAKECMDGOALS) $(always)
    # ---------------------------------------------------------------------------
    quiet_cmd_cpp_lds_S = LDS $@
    cmd_cpp_lds_S = $(CPP) $(cpp_flags) -P -C -U$(ARCH) \
    - -D__ASSEMBLY__ -o $@ $<
    + -D__ASSEMBLY__ -DLINKER_SCRIPT -o $@ $<

    $(obj)/ $(src)/ FORCE
    $(call if_changed_dep,cpp_lds_S)

     \ /
      Last update: 2009-09-21 00:17    [W:0.022 / U:47.948 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site