[PATCH] Add retain_initrd boot option
[linux-2.6.git] / arch / s390 / Makefile
index 98db30481d97eb211d1e767ca9701767e323dc09..6598e526857334bdf3f167cd8e9d721842e10a9d 100644 (file)
 # Copyright (C) 1994 by Linus Torvalds
 #
 
-ifdef CONFIG_ARCH_S390_31
+ifndef CONFIG_64BIT
 LDFLAGS                := -m elf_s390
 CFLAGS         += -m31
 AFLAGS         += -m31
 UTS_MACHINE    := s390
 STACK_SIZE     := 8192
 CHECKFLAGS     += -D__s390__
-endif
-
-ifdef CONFIG_ARCH_S390X
+else
 LDFLAGS                := -m elf64_s390
 MODFLAGS       += -fpic -D__PIC__
 CFLAGS         += -m64
@@ -35,6 +33,15 @@ endif
 cflags-$(CONFIG_MARCH_G5)   += $(call cc-option,-march=g5)
 cflags-$(CONFIG_MARCH_Z900) += $(call cc-option,-march=z900)
 cflags-$(CONFIG_MARCH_Z990) += $(call cc-option,-march=z990)
+cflags-$(CONFIG_MARCH_Z9_109) += $(call cc-option,-march=z9-109)
+
+#KBUILD_IMAGE is necessary for make rpm
+KBUILD_IMAGE   :=arch/s390/boot/image
+
+#
+# Prevent tail-call optimizations, to get clearer backtraces:
+#
+cflags-$(CONFIG_FRAME_POINTER) += -fno-optimize-sibling-calls
 
 # old style option for packed stacks
 ifeq ($(call cc-option-yn,-mkernel-backchain),y)
@@ -69,19 +76,16 @@ cflags-$(CONFIG_WARN_STACK) += -mwarn-framesize=$(CONFIG_WARN_STACK_SIZE)
 endif
 
 CFLAGS         += -mbackchain -msoft-float $(cflags-y)
-CFLAGS         += $(call cc-option,-finline-limit=10000)
 CFLAGS                 += -pipe -fno-strength-reduce -Wno-sign-compare 
 AFLAGS         += $(aflags-y)
 
 OBJCOPYFLAGS   := -O binary
 LDFLAGS_vmlinux := -e start
 
-head-$(CONFIG_ARCH_S390_31)    += arch/$(ARCH)/kernel/head.o
-head-$(CONFIG_ARCH_S390X)      += arch/$(ARCH)/kernel/head64.o
-head-y                         += arch/$(ARCH)/kernel/init_task.o
+head-y         := arch/$(ARCH)/kernel/head.o arch/$(ARCH)/kernel/init_task.o
 
 core-y         += arch/$(ARCH)/mm/ arch/$(ARCH)/kernel/ arch/$(ARCH)/crypto/ \
-                  arch/$(ARCH)/appldata/
+                  arch/$(ARCH)/appldata/ arch/$(ARCH)/hypfs/
 libs-y         += arch/$(ARCH)/lib/
 drivers-y      += drivers/s390/
 drivers-$(CONFIG_MATHEMU) += arch/$(ARCH)/math-emu/