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

[sam at ravnborg.org]

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

Compile tested with my sparc cross compile toolchain.

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

diff --git a/usr/klibc/arch/sparc/Kbuild b/usr/klibc/arch/sparc/Kbuild
new file mode 100644
index 0000000..d013f5d
--- /dev/null
+++ b/usr/klibc/arch/sparc/Kbuild
@@ -0,0 +1,34 @@
+#
+# klibc files for sparc
+#
+
+always  := crt0.o
+targets := crt0.o
+
+m4-targets := sdiv.o srem.o udiv.o urem.o
+
+klib-y := $(m4-targets) smul.o umul.o __muldi3.o
+klib-y += setjmp.o pipe.o syscall.o sysfork.o
+
+klib-y += ../../libgcc/__ashldi3.o ../../libgcc/__ashrdi3.o
+klib-y += ../../libgcc/__lshrdi3.o ../../libgcc/__divdi3.o
+klib-y += ../../libgcc/__moddi3.o  ../../libgcc/__udivdi3.o
+klib-y += ../../libgcc/__umoddi3.o ../../libgcc/__udivmoddi4.o
+klib-y += ../../libgcc/__clzsi2.o
+
+
+$(obj)/sdiv.S: m4 := define(NAME,\`.div')define(OP,\`div')define(S,\`true')
+$(obj)/srem.S: m4 := define(NAME,\`.rem')define(OP,\`rem')define(S,\`true')
+$(obj)/udiv.S: m4 := define(NAME,\`.udiv')define(OP,\`div')define(S,\`false')
+$(obj)/urem.S: m4 := define(NAME,\`.urem')define(OP,\`rem')define(S,\`false')
+
+targets += $(m4-targets) $(m4-targets:.o=.S)
+
+quiet_cmd_m4 = M4      $@
+      cmd_m4 = (echo "$(m4)"; cat $^) | m4 > $@
+
+# build .o from .S
+$(addprefix $(obj)/,$(m4-targets)): $(obj)/%.o : $(obj)/%.S
+# build .S from .m4
+$(addprefix $(obj)/,$(m4-targets:.o=.S)): $(src)/divrem.m4
+	$(call if_changed,m4)
diff --git a/usr/klibc/arch/sparc/Makefile.inc b/usr/klibc/arch/sparc/Makefile.inc
index 6fa9327..54bb6e1 100644
--- a/usr/klibc/arch/sparc/Makefile.inc
+++ b/usr/klibc/arch/sparc/Makefile.inc
@@ -6,43 +6,3 @@ # Special rules for this architecture.  
 # included from the main Makefile, and that pathnames should be
 # accordingly.
 #
-
-m4-targets := arch/$(KLIBCARCH)/sdiv.o arch/$(KLIBCARCH)/srem.o \
-              arch/$(KLIBCARCH)/udiv.o arch/$(KLIBCARCH)/urem.o
-
-KLIBCARCHOBJS = $(m4-targets) \
-	arch/$(KLIBCARCH)/smul.o \
-	arch/$(KLIBCARCH)/umul.o \
-	arch/$(KLIBCARCH)/__muldi3.o \
-	arch/$(KLIBCARCH)/setjmp.o \
-	arch/$(KLIBCARCH)/pipe.o \
-	arch/$(KLIBCARCH)/syscall.o \
-	arch/$(KLIBCARCH)/sysfork.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 \
-	libgcc/__clzsi2.o \
-
-
-adir := $(obj)/arch/$(KLIBCARCH)
-
-$(adir)/sdiv.S: m4 := define(NAME,\`.div')define(OP,\`div')define(S,\`true')
-$(adir)/srem.S: m4 := define(NAME,\`.rem')define(OP,\`rem')define(S,\`true')
-$(adir)/udiv.S: m4 := define(NAME,\`.udiv')define(OP,\`div')define(S,\`false')
-$(adir)/urem.S: m4 := define(NAME,\`.urem')define(OP,\`rem')define(S,\`false')
-
-targets += $(m4-targets) $(m4-targets:.o=.S)
-
-quiet_cmd_m4 = M4      $@
-      cmd_m4 = (echo "$(m4)"; cat $^) | m4 > $@
-
-# build .o from .S
-$(addprefix $(obj)/,$(m4-targets)): $(adir)/%.o : $(adir)/%.S
-# build .S from .m4
-$(addprefix $(obj)/,$(m4-targets:.o=.S)): $(src)/arch/$(KLIBCARCH)/divrem.m4
-	$(call if_changed,m4)
-- 
1.4.1.rc2.gfc04