Commit 82897ede authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

s390: cleanup arch/s390/kernel Makefile 



Group all compiler flag modification lines together and sort them
alphabetically. This should hopefully prevent future bugs due to
missing flag modifications.
Also fix indentation at some places.

Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent d543a106

arch/s390/kernel/Makefile

+36 −30
Original line number Diff line number Diff line
@@ -2,14 +2,41 @@ 
# Makefile for the linux kernel.

#



ifdef CONFIG_FUNCTION_TRACER



# Do not trace tracer code

CFLAGS_REMOVE_ftrace.o	= $(CC_FLAGS_FTRACE)



# Do not trace early setup code

CFLAGS_REMOVE_als.o	= $(CC_FLAGS_FTRACE)

CFLAGS_REMOVE_early.o	= $(CC_FLAGS_FTRACE)

CFLAGS_REMOVE_sclp.o	= $(CC_FLAGS_FTRACE)



endif



GCOV_PROFILE_als.o	:= n

GCOV_PROFILE_early.o	:= n

GCOV_PROFILE_sclp.o	:= n



KCOV_INSTRUMENT_als.o	:= n

KCOV_INSTRUMENT_early.o	:= n

KCOV_INSTRUMENT_sclp.o	:= n

KCOV_INSTRUMENT_als.o := n



ifdef CONFIG_FUNCTION_TRACER

# Don't trace early setup code and tracing code

CFLAGS_REMOVE_early.o = $(CC_FLAGS_FTRACE)

CFLAGS_REMOVE_ftrace.o = $(CC_FLAGS_FTRACE)

UBSAN_SANITIZE_als.o	:= n

UBSAN_SANITIZE_early.o	:= n

UBSAN_SANITIZE_sclp.o	:= n



#

# Use -march=z900 for sclp.c and als.c to be able to print an error

# message if the kernel is started on a machine which is too old

#

ifneq ($(CC_FLAGS_MARCH),-march=z900)

CFLAGS_REMOVE_als.o	+= $(CC_FLAGS_MARCH)

CFLAGS_als.o		+= -march=z900

CFLAGS_REMOVE_sclp.o	+= $(CC_FLAGS_MARCH)

CFLAGS_sclp.o		+= -march=z900

AFLAGS_REMOVE_head.o	+= $(CC_FLAGS_MARCH)

AFLAGS_head.o		+= -march=z900

endif



#
@@ -32,27 +59,6 @@ CFLAGS_ptrace.o += -DUTS_MACHINE='"$(UTS_MACHINE)"' 


CFLAGS_sysinfo.o	+= -w



#

# Use -march=z900 for sclp.c and als.c to be able to print an error

# message if the kernel is started on a machine which is too old

#

CFLAGS_REMOVE_sclp.o = $(CC_FLAGS_FTRACE)

CFLAGS_REMOVE_als.o = $(CC_FLAGS_FTRACE)

ifneq ($(CC_FLAGS_MARCH),-march=z900)

CFLAGS_REMOVE_sclp.o	+= $(CC_FLAGS_MARCH)

CFLAGS_sclp.o		+= -march=z900

CFLAGS_REMOVE_als.o	+= $(CC_FLAGS_MARCH)

CFLAGS_als.o		+= -march=z900

AFLAGS_REMOVE_head.o	+= $(CC_FLAGS_MARCH)

AFLAGS_head.o		+= -march=z900

endif

GCOV_PROFILE_early.o := n

GCOV_PROFILE_sclp.o := n

GCOV_PROFILE_als.o := n

UBSAN_SANITIZE_als.o := n

UBSAN_SANITIZE_early.o := n

UBSAN_SANITIZE_sclp.o := n



obj-y	:= traps.o time.o process.o base.o early.o setup.o idle.o vtime.o

obj-y	+= processor.o sys_s390.o ptrace.o signal.o cpcmd.o ebcdic.o nmi.o

obj-y	+= debug.o irq.o ipl.o dis.o diag.o sclp.o vdso.o als.o