[klibc] [patch] klibc (inkernel): merge s390/s390x #4

[Heiko Carstens]

From: Heiko Carstens <heiko.carstens at de.ibm.com>

Changes needed for the inkernel klibc merge of s390/s390x.

Signed-off-by: Heiko Carstens <heiko.carstens at de.ibm.com>
---

 Makefile           |    3 ++-
 arch/s390/Makefile |    4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff -purN a/Makefile b/Makefile
--- a/Makefile	2006-05-27 12:12:38.000000000 +0200
+++ b/Makefile	2006-05-27 12:18:28.000000000 +0200
@@ -180,6 +180,7 @@ UTS_MACHINE	:= $(ARCH)
 
 # Architecture used to compile user-space code
 KLIBCARCH	?= $(ARCH)
+KLIBCARCHDIR	?= $(KLIBCARCH)
 
 # klibc definitions
 export KLIBCINC := usr/include
@@ -326,7 +327,7 @@ export VERSION PATCHLEVEL SUBLEVEL KERNE
 export KLIBCARCH CONFIG_SHELL HOSTCC HOSTCFLAGS CROSS_COMPILE AS LD
 export CC CPP AR RANLIB NM STRIP OBJCOPY OBJDUMP MAKE AWK GENKSYMS
 export PERL UTS_MACHINE HOSTCXX HOSTCXXFLAGS LDFLAGS_MODULE CHECK
-export CHECKFLAGS
+export CHECKFLAGS KLIBCARCHDIR
 
 export CPPFLAGS NOSTDINC_FLAGS LINUXINCLUDE OBJCOPYFLAGS LDFLAGS
 export CFLAGS CFLAGS_KERNEL CFLAGS_MODULE 
diff -purN a/arch/s390/Makefile b/arch/s390/Makefile
--- a/arch/s390/Makefile	2006-05-27 12:11:36.000000000 +0200
+++ b/arch/s390/Makefile	2006-05-27 12:19:31.000000000 +0200
@@ -20,6 +20,7 @@ AFLAGS		+= -m31
 UTS_MACHINE	:= s390
 STACK_SIZE	:= 8192
 CHECKFLAGS	+= -D__s390__
+KLIBCARCH	:= s390
 else
 LDFLAGS		:= -m elf64_s390
 MODFLAGS	+= -fpic -D__PIC__
@@ -28,8 +29,11 @@ AFLAGS		+= -m64
 UTS_MACHINE	:= s390x
 STACK_SIZE	:= 16384
 CHECKFLAGS	+= -D__s390__ -D__s390x__
+KLIBCARCH	:= s390x
 endif
 
+KLIBCARCHDIR	:= s390
+
 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)