Commit 96fb54a1 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Martin Schwidefsky
Browse files

s390: boot, purgatory: pass $(CLANG_FLAGS) where needed 



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: default avatarArnd Bergmann <arnd@arndb.de>
Reviewed-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent c263a4e9

arch/s390/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -21,9 +21,9 @@ KBUILD_CFLAGS += -fPIE 
LDFLAGS_vmlinux	:= -pie

endif

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

arch/s390/purgatory/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,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))

CRA Git | Maintained and supported by SUSTech CRA and CCSE