s390: compile head.S always with -march=z900

head.S on s390 contains some sanity checks if the kernel will run on a
machine or if the machine is too old, e.g. if the kernel contains
instructions not available on the machine. If so, it will emit an error
message to the console before it stops execution.

Therefore head.S contains only instructions which are availanble with the
earliest machine generation (z900).  In order to make sure we don't
accidently add instructions which are not available on z900, always compile
with -march=z900. This makes sure compilation will fail if wrong
instructions are used.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/kernel/Makefile b/arch/s390/kernel/Makefile
index dc167a23b92055b63ecf20f9e9146f672b98ac0e..e9a328d426105664012ad1eea5a66152e3a75e06 100644 (file)
--- a/arch/s390/kernel/Makefile
+++ b/arch/s390/kernel/Makefile
@@ -34,8 +34,10 @@ CFLAGS_sysinfo.o += -w
 #
 CFLAGS_REMOVE_sclp.o = $(CC_FLAGS_FTRACE)
 ifneq ($(CC_FLAGS_MARCH),-march=z900)
-CFLAGS_REMOVE_sclp.o += $(CC_FLAGS_MARCH)
-CFLAGS_sclp.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
 GCOV_PROFILE_sclp.o := n