[klibc] [PATCH] klibc/kbuild: fix s390 build

[sam at ravnborg.org]

From: Sam Ravnborg <sam at mars.ravnborg.org>

Not tested since I do not have a s390 toolchain available.
But changes was simple so it is likely that they work.

Signed-off-by: Sam Ravnborg <sam at ravnborg.org>
---
 usr/klibc/arch/s390/Kbuild       |   22 ++++++++++++++++++++++
 usr/klibc/arch/s390/Makefile.inc |   29 -----------------------------
 2 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/usr/klibc/arch/s390/Kbuild b/usr/klibc/arch/s390/Kbuild
new file mode 100644
index 0000000..6a8e97a
--- /dev/null
+++ b/usr/klibc/arch/s390/Kbuild
@@ -0,0 +1,22 @@
+#
+# klibc files for s390
+#
+
+always  := crt0.o
+targets := crt0.o
+
+ifneq ("$(KLIBCARCH)", "s390x")
+
+klib-y := setjmp.o mmap.o syscall.o
+
+klib-y += ../../libgcc/__clzsi2.o   ../../libgcc/__ashldi3.o
+klib-y += ../../libgcc/__ashrdi3.o  ../../libgcc/__lshrdi3.o
+klib-y += ../../libgcc/__divdi3.o   ../../libgcc/__moddi3.o
+klib-y += ../../libgcc/__udivdi3.o  ../../libgcc/__umoddi3.o
+klib-y += ../../libgcc/__udivmoddi4.o
+
+else
+
+klib-y := setjmp.o mmap.o syscall.o
+
+endif
diff --git a/usr/klibc/arch/s390/Makefile.inc b/usr/klibc/arch/s390/Makefile.inc
index d81bf29..842df49 100644
--- a/usr/klibc/arch/s390/Makefile.inc
+++ b/usr/klibc/arch/s390/Makefile.inc
@@ -6,32 +6,3 @@ # Special rules for this architecture. N
 # included from the main Makefile, and that pathnames should be
 # accordingly.
 #
-
-ifneq ("$(KLIBCARCH)", "s390x")
-
-KLIBCARCHOBJS = \
-	arch/$(KLIBCARCHDIR)/setjmp.o \
-	arch/$(KLIBCARCHDIR)/mmap.o \
-	arch/$(KLIBCARCHDIR)/syscall.o \
-	libgcc/__clzsi2.o \
-	libgcc/__ashldi3.o \
-	libgcc/__ashrdi3.o \
-	libgcc/__lshrdi3.o \
-	libgcc/__divdi3.o \
-	libgcc/__moddi3.o \
-	libgcc/__udivdi3.o \
-	libgcc/__umoddi3.o \
-	libgcc/__udivmoddi4.o
-
-else
-
-KLIBCARCHOBJS = \
-	arch/$(KLIBCARCHDIR)/setjmp.o \
-	arch/$(KLIBCARCHDIR)/mmap.o \
-	arch/$(KLIBCARCHDIR)/syscall.o
-
-endif
-
-KLIBCARCHSOOBJS = $(patsubst %.o,%.lo,$(KLIBCARCHOBJS))
-
-archclean:
-- 
1.4.1.rc2.gfc04