[klibc] [PATCH] klibc/kbuild: fix cris build (hopefully)

[sam at ravnborg.org]

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

This is an update of cris to new kbuild support.
I had no toolchain available so it is likely broken, but
will be glad to sort it out quickly.

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

diff --git a/usr/klibc/arch/cris/Kbuild b/usr/klibc/arch/cris/Kbuild
new file mode 100644
index 0000000..13ceeec
--- /dev/null
+++ b/usr/klibc/arch/cris/Kbuild
@@ -0,0 +1,28 @@
+#
+# klibc files fora cris
+#
+
+always  := crt0.o
+targets := crt0.o
+
+klib-y += __negdi2.o setjmp.o syscall.o vfork.o
+
+klib-y += ../../libgcc/__divdi3.o     ../../libgcc/__moddi3.o
+klib-y += ../../libgcc/__udivdi3.o    ../../libgcc/__umoddi3.o
+klib-y += ../../libgcc/__udivmoddi4.o
+
+# Divide support
+klib-y := __Umod.o __Udiv.o __Mod.o __Div.o
+
+quiet_cmd_cc-div = DIV-CC  $@
+      cmd_cc-div = $(KLIBCC) $(klibccflags) -c -o $@ $<
+
+
+$(obj)/__Umod.o: $(src)/divide.c
+KLIBCCFLAGS___Umod.o := -DSIGNED=0 -DREM=1 -DBITS=32 -DNAME=__Umod
+$(obj)/__Udiv.o: $(src)/divide.c
+KLIBCCFLAGS___Udiv.o := -DSIGNED=0 -DREM=0 -DBITS=32 -DNAME=__Udiv
+$(obj)/__Mod.o: $(src)/divide.c
+KLIBCCFLAGS___Mod.o  := -DSIGNED=1 -DREM=1 -DBITS=32 -DNAME=__Mod
+$(obj)/__Div.o: $(src)/divide.c
+KLIBCCFLAGS___Div.o  := -DSIGNED=1 -DREM=0 -DBITS=32 -DNAME=__Div
diff --git a/usr/klibc/arch/cris/Makefile.inc b/usr/klibc/arch/cris/Makefile.inc
index ac93d2d..8e6e319 100644
--- a/usr/klibc/arch/cris/Makefile.inc
+++ b/usr/klibc/arch/cris/Makefile.inc
@@ -6,29 +6,3 @@ # Special rules for this architecture.  
 # included from the main Makefile, and that pathnames should be
 # accordingly.
 #
-
-KLIBCARCHOBJS = \
-	arch/$(KLIBCARCH)/__Umod.o \
-	arch/$(KLIBCARCH)/__Udiv.o \
-	arch/$(KLIBCARCH)/__Mod.o \
-	arch/$(KLIBCARCH)/__Div.o \
-	arch/$(KLIBCARCH)/__negdi2.o \
-	arch/$(KLIBCARCH)/setjmp.o \
-	arch/$(KLIBCARCH)/syscall.o \
-	arch/$(KLIBCARCH)/vfork.o \
-	libgcc/__divdi3.o \
-	libgcc/__moddi3.o \
-	libgcc/__udivdi3.o \
-	libgcc/__umoddi3.o \
-	libgcc/__udivmoddi4.o
-
-arch/$(KLIBCARCH)/__Umod.o: arch/$(KLIBCARCH)/divide.c
-	$(CC) $(CFLAGS) -DSIGNED=0 -DREM=1 -DBITS=32 -DNAME=__Umod -c -o $@ $<
-arch/$(KLIBCARCH)/__Udiv.o: arch/$(KLIBCARCH)/divide.c
-	$(CC) $(CFLAGS) -DSIGNED=0 -DREM=0 -DBITS=32 -DNAME=__Udiv -c -o $@ $<
-arch/$(KLIBCARCH)/__Mod.o: arch/$(KLIBCARCH)/divide.c
-	$(CC) $(CFLAGS) -DSIGNED=1 -DREM=1 -DBITS=32 -DNAME=__Mod -c -o $@ $<
-arch/$(KLIBCARCH)/__Div.o: arch/$(KLIBCARCH)/divide.c
-	$(CC) $(CFLAGS) -DSIGNED=1 -DREM=0 -DBITS=32 -DNAME=__Div -c -o $@ $<
-
-archclean:
-- 
1.4.1.rc2.gfc04