lkml.org 
[lkml]   [2019]   [Apr]   [15]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v2 2/4] s390: boot, purgatory: pass $(CLANG_FLAGS) where needed
    Date
    The purgatory and boot Makefiles do not inherit the original cflags,
    so clang falls back to the default target architecture when building it,
    typically this would be x86 when cross-compiling.

    Add $(CLANG_FLAGS) everywhere so we pass the correct --target=s390x-linux
    option when cross-compiling.

    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    arch/s390/Makefile | 4 ++--
    arch/s390/purgatory/Makefile | 1 +
    2 files changed, 3 insertions(+), 2 deletions(-)

    diff --git a/arch/s390/Makefile b/arch/s390/Makefile
    index 9c079a506325..9a228786e34f 100644
    --- a/arch/s390/Makefile
    +++ b/arch/s390/Makefile
    @@ -17,9 +17,9 @@ KBUILD_CFLAGS_MODULE += -fPIC
    KBUILD_AFLAGS += -m64
    KBUILD_CFLAGS += -m64
    aflags_dwarf := -Wa,-gdwarf-2
    -KBUILD_AFLAGS_DECOMPRESSOR := -m64 -D__ASSEMBLY__
    +KBUILD_AFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -D__ASSEMBLY__
    KBUILD_AFLAGS_DECOMPRESSOR += $(if $(CONFIG_DEBUG_INFO),$(aflags_dwarf))
    -KBUILD_CFLAGS_DECOMPRESSOR := -m64 -O2
    +KBUILD_CFLAGS_DECOMPRESSOR := $(CLANG_FLAGS) -m64 -O2
    KBUILD_CFLAGS_DECOMPRESSOR += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY
    KBUILD_CFLAGS_DECOMPRESSOR += -fno-delete-null-pointer-checks -msoft-float
    KBUILD_CFLAGS_DECOMPRESSOR += -fno-asynchronous-unwind-tables
    diff --git a/arch/s390/purgatory/Makefile b/arch/s390/purgatory/Makefile
    index ce6a3f75065b..ecd0b3847fef 100644
    --- a/arch/s390/purgatory/Makefile
    +++ b/arch/s390/purgatory/Makefile
    @@ -22,6 +22,7 @@ KBUILD_CFLAGS := -fno-strict-aliasing -Wall -Wstrict-prototypes
    KBUILD_CFLAGS += -Wno-pointer-sign -Wno-sign-compare
    KBUILD_CFLAGS += -fno-zero-initialized-in-bss -fno-builtin -ffreestanding
    KBUILD_CFLAGS += -c -MD -Os -m64 -msoft-float -fno-common
    +KBUILD_CFLAGS += $(CLANG_FLAGS)
    KBUILD_CFLAGS += $(call cc-option,-fno-PIE)
    KBUILD_AFLAGS := $(filter-out -DCC_USING_EXPOLINE,$(KBUILD_AFLAGS))

    --
    2.20.0
    \
     
     \ /
      Last update: 2019-04-15 10:37    [W:3.219 / U:0.204 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site