vserver 1.9.3

[linux-2.6.git] / arch / s390 / Makefile

diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 68c1a72..6d2c7eb 100644 (file)
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -18,6 +18,7 @@ LDFLAGS               := -m elf_s390
 CFLAGS         += -m31
 AFLAGS         += -m31
 UTS_MACHINE    := s390
+STACK_SIZE     := 8192
 endif
 
 ifdef CONFIG_ARCH_S390X
@@ -26,16 +27,37 @@ MODFLAGS    += -fpic -D__PIC__
 CFLAGS         += -m64
 AFLAGS         += -m64
 UTS_MACHINE    := s390x
+STACK_SIZE     := 16384
 endif
 
-cflags-$(CONFIG_MARCH_G5)   += $(call check_gcc,-march=g5,)
-cflags-$(CONFIG_MARCH_Z900) += $(call check_gcc,-march=z900,)
-cflags-$(CONFIG_MARCH_Z990) += $(call check_gcc,-march=z990,)
+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)
+
+ifeq ($(call cc-option-yn,-mkernel-backchain),y)
+cflags-$(CONFIG_PACK_STACK)  += -mkernel-backchain -D__PACK_STACK
+aflags-$(CONFIG_PACK_STACK)  += -D__PACK_STACK
+cflags-$(CONFIG_SMALL_STACK) += -D__SMALL_STACK
+aflags-$(CONFIG_SMALL_STACK) += -D__SMALL_STACK
+ifdef CONFIG_SMALL_STACK
+STACK_SIZE := $(shell echo $$(($(STACK_SIZE)/2)) )
+endif
+endif
+
+ifeq ($(call cc-option-yn,-mstack-size=8192 -mstack-guard=128),y)
+cflags-$(CONFIG_CHECK_STACK) += -mstack-size=$(STACK_SIZE)
+cflags-$(CONFIG_CHECK_STACK) += -mstack-guard=$(CONFIG_STACK_GUARD)
+endif
+
+ifeq ($(call cc-option-yn,-mwarn-dynamicstack),y)
+cflags-$(CONFIG_WARN_STACK) += -mwarn-dynamicstack
+cflags-$(CONFIG_WARN_STACK) += -mwarn-framesize=$(CONFIG_WARN_STACK_SIZE)
+endif
 
-CFLAGS         += $(cflags-y)
-CFLAGS         += $(call check_gcc,-finline-limit=10000,)
+CFLAGS         += -mbackchain $(cflags-y)
+CFLAGS         += $(call cc-option,-finline-limit=10000)
 CFLAGS                 += -pipe -fno-strength-reduce -Wno-sign-compare 
-CFLAGS         += -mbackchain
+AFLAGS         += $(aflags-y)
 
 OBJCOPYFLAGS   := -O binary
 LDFLAGS_vmlinux := -e start