sam at ravnborg.org
2006-Jul-10 17:37 UTC
[klibc] [PATCH] klibc/kbuild: fix ppc64 for new list based kbuild build
From: Sam Ravnborg <sam at mars.ravnborg.org> There was some left-overs in Makefile.inc that was nolonger used. So conversion was straight forward. Signed-off-by: Sam Ravnborg <sam at ravnborg.org> --- usr/klibc/arch/ppc64/Kbuild | 8 ++++++++ usr/klibc/arch/ppc64/Makefile.inc | 17 ----------------- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/usr/klibc/arch/ppc64/Kbuild b/usr/klibc/arch/ppc64/Kbuild new file mode 100644 index 0000000..a39e91f --- /dev/null +++ b/usr/klibc/arch/ppc64/Kbuild @@ -0,0 +1,8 @@ +# +# klibc files for ppc64 +# + +klib-y := setjmp.o syscall.o + +always := crt0.o +targets := crt0.o diff --git a/usr/klibc/arch/ppc64/Makefile.inc b/usr/klibc/arch/ppc64/Makefile.inc index 80f6be5..403eb01 100644 --- a/usr/klibc/arch/ppc64/Makefile.inc +++ b/usr/klibc/arch/ppc64/Makefile.inc @@ -6,20 +6,3 @@ # Special rules for this architecture. # included from the main Makefile, and that pathnames should be # accordingly. # - -KLIBCARCHOBJS = \ - arch/$(KLIBCARCH)/setjmp.o \ - arch/$(KLIBCARCH)/syscall.o - -KLIBCARCHSOOBJS = $(patsubst %.o,%.lo,$(KLIBCARCHOBJS)) - -INTERP_O = interp1.o - -interp.o: interp1.o klibc.got - $(LD) $(KLIBCLDFLAGS) -r -o $@ interp1.o klibc.got - -klibc.got: $(SOHASH) - $(OBJCOPY) -j .got $< $@ - -archclean: - rm -f klibc.got -- 1.4.1.rc2.gfc04
From: Sam Ravnborg <sam at mars.ravnborg.org> Apparently there was nothing needed in arch/mips64 to support klibc. Signed-off-by: Sam Ravnborg <sam at ravnborg.org> --- usr/klibc/arch/mips64/Kbuild | 3 +++ usr/klibc/arch/mips64/Makefile.inc | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/usr/klibc/arch/mips64/Kbuild b/usr/klibc/arch/mips64/Kbuild new file mode 100644 index 0000000..970c0f8 --- /dev/null +++ b/usr/klibc/arch/mips64/Kbuild @@ -0,0 +1,3 @@ +# +# klibc files for mips64 +# diff --git a/usr/klibc/arch/mips64/Makefile.inc b/usr/klibc/arch/mips64/Makefile.inc index 4a9529a..aa70319 100644 --- a/usr/klibc/arch/mips64/Makefile.inc +++ b/usr/klibc/arch/mips64/Makefile.inc @@ -6,5 +6,3 @@ # Special rules for this architecture. # included from the main Makefile, and that pathnames should be # accordingly. # - -archclean: -- 1.4.1.rc2.gfc04
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