Commit 76bf9d6c authored by Vasily Gorbik's avatar Vasily Gorbik Committed by Martin Schwidefsky
Browse files

s390/decompressor: correct build flags 



The decompressor requires its own set of cc and asm flags, to avoid
building with features which do not make sense at such an early boot stage
(e.g. expoline, ftrace).

Currently cc flags are already set for the decompressor, but "cflags-y"
is not exported and hence empty. To fix that and to add asm flags, define
and export KBUILD_AFLAGS_DECOMPRESSOR and KBUILD_CFLAGS_DECOMPRESSOR
and rely on them in the decompressor's Makefile.

Reviewed-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 19f73e16

arch/s390/Makefile

+17 −3
Original line number Diff line number Diff line
@@ -14,8 +14,14 @@ LD_BFD := elf64-s390 
LDFLAGS		:= -m elf64_s390

KBUILD_AFLAGS_MODULE += -fPIC

KBUILD_CFLAGS_MODULE += -fPIC

KBUILD_CFLAGS	+= -m64

KBUILD_AFLAGS	+= -m64

KBUILD_CFLAGS	+= -m64

KBUILD_AFLAGS_DECOMPRESSOR := -m64 -D__ASSEMBLY__

KBUILD_CFLAGS_DECOMPRESSOR := -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

KBUILD_CFLAGS_DECOMPRESSOR += $(call cc-option,-ffreestanding)

UTS_MACHINE	:= s390x

STACK_SIZE	:= 16384

CHECKFLAGS	+= -D__s390__ -D__s390x__
@@ -57,6 +63,9 @@ cflags-$(CONFIG_PACK_STACK) += -mpacked-stack -D__PACK_STACK 
aflags-$(CONFIG_PACK_STACK)  += -D__PACK_STACK

endif



KBUILD_AFLAGS_DECOMPRESSOR += $(aflags-y)

KBUILD_CFLAGS_DECOMPRESSOR += $(cflags-y)



ifeq ($(call cc-option-yn,-mstack-size=8192 -mstack-guard=128),y)

cflags-$(CONFIG_CHECK_STACK) += -mstack-size=$(STACK_SIZE)

ifneq ($(call cc-option-yn,-mstack-size=8192),y)
@@ -64,8 +73,11 @@ cflags-$(CONFIG_CHECK_STACK) += -mstack-guard=$(CONFIG_STACK_GUARD) 
endif

endif



ifdef CONFIG_WARN_DYNAMIC_STACK

  ifeq ($(call cc-option-yn,-mwarn-dynamicstack),y)

cflags-$(CONFIG_WARN_DYNAMIC_STACK) += -mwarn-dynamicstack

    KBUILD_CFLAGS += -mwarn-dynamicstack

    KBUILD_CFLAGS_DECOMPRESSOR += -mwarn-dynamicstack

  endif

endif



ifdef CONFIG_EXPOLINE
@@ -96,6 +108,8 @@ KBUILD_CFLAGS += -mbackchain -msoft-float $(cflags-y) 
KBUILD_CFLAGS	+= -pipe -fno-strength-reduce -Wno-sign-compare

KBUILD_CFLAGS	+= -fno-asynchronous-unwind-tables $(cfi)

KBUILD_AFLAGS	+= $(aflags-y) $(cfi)

export KBUILD_AFLAGS_DECOMPRESSOR

export KBUILD_CFLAGS_DECOMPRESSOR



OBJCOPYFLAGS	:= -O binary

arch/s390/boot/compressed/Makefile

+4 −9
Original line number Diff line number Diff line
@@ -6,20 +6,15 @@ 
#



KCOV_INSTRUMENT := n

GCOV_PROFILE := n

UBSAN_SANITIZE := n



targets	:= vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2

targets += vmlinux.bin.xz vmlinux.bin.lzma vmlinux.bin.lzo vmlinux.bin.lz4

targets += misc.o piggy.o sizes.h head.o



KBUILD_CFLAGS := -m64 -D__KERNEL__ -O2

KBUILD_CFLAGS += -DDISABLE_BRANCH_PROFILING -D__NO_FORTIFY

KBUILD_CFLAGS += $(cflags-y) -fno-delete-null-pointer-checks -msoft-float

KBUILD_CFLAGS += -fno-asynchronous-unwind-tables

KBUILD_CFLAGS += $(call cc-option,-mpacked-stack)

KBUILD_CFLAGS += $(call cc-option,-ffreestanding)



GCOV_PROFILE := n

UBSAN_SANITIZE := n

KBUILD_AFLAGS := $(KBUILD_AFLAGS_DECOMPRESSOR)

KBUILD_CFLAGS := $(KBUILD_CFLAGS_DECOMPRESSOR)



OBJECTS := $(addprefix $(objtree)/arch/s390/kernel/, head.o ebcdic.o als.o)

OBJECTS += $(objtree)/drivers/s390/char/sclp_early_core.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE