Sam Ravnborg
2006-Jul-09 21:40 UTC
[klibc] [PATCH] klibc/kbuild: fix i386 to support new list based klibc build
Signed-off-by: Sam Ravnborg <sam at ravnborg.org> --- OK, decided to port another popular architecture.. The relative path for libgcc stuff is outright ugly but I could not see a better way to fix it. Sam usr/klibc/arch/i386/Kbuild | 16 ++++++++++++++++ usr/klibc/arch/i386/Makefile.inc | 21 --------------------- 2 files changed, 16 insertions(+), 21 deletions(-) diff --git a/usr/klibc/arch/i386/Kbuild b/usr/klibc/arch/i386/Kbuild new file mode 100644 index 0000000..8603cc8 --- /dev/null +++ b/usr/klibc/arch/i386/Kbuild @@ -0,0 +1,17 @@ +# +# klibc .o files for i386 +# + +klib-y := socketcall.o setjmp.o syscall.o varsyscall.o +klib-y += open.o openat.o sigreturn.o vfork.o +klib-y += libgcc/__ashldi3.o libgcc/__ashrdi3.o libgcc/__lshrdi3.o +klib-y += libgcc/__muldi3.o libgcc/__negdi2.o + +klib-y += ../../libgcc/__divdi3.o +klib-y += ../../libgcc/__moddi3.o +klib-y += ../../libgcc/__udivdi3.o +klib-y += ../../libgcc/__umoddi3.o +klib-y += ../../libgcc/__udivmoddi4.o + +always := crt0.o +targets := crt0.o diff --git a/usr/klibc/arch/i386/Makefile.inc b/usr/klibc/arch/i386/Makefile.inc index d13a28f..27a6e67 100644 --- a/usr/klibc/arch/i386/Makefile.inc +++ b/usr/klibc/arch/i386/Makefile.inc @@ -7,24 +7,3 @@ # included from the main Makefile, and t # accordingly. # -KLIBCARCHOBJS = \ - arch/$(KLIBCARCH)/socketcall.o \ - arch/$(KLIBCARCH)/setjmp.o \ - arch/$(KLIBCARCH)/syscall.o \ - arch/$(KLIBCARCH)/varsyscall.o \ - arch/$(KLIBCARCH)/open.o \ - arch/$(KLIBCARCH)/openat.o \ - arch/$(KLIBCARCH)/sigreturn.o \ - arch/$(KLIBCARCH)/vfork.o \ - arch/$(KLIBCARCH)/libgcc/__ashldi3.o \ - arch/$(KLIBCARCH)/libgcc/__ashrdi3.o \ - arch/$(KLIBCARCH)/libgcc/__lshrdi3.o \ - arch/$(KLIBCARCH)/libgcc/__muldi3.o \ - arch/$(KLIBCARCH)/libgcc/__negdi2.o \ - libgcc/__divdi3.o \ - libgcc/__moddi3.o \ - libgcc/__udivdi3.o \ - libgcc/__umoddi3.o \ - libgcc/__udivmoddi4.o - -archclean: -- 1.4.1.rc2.gfc04