diff options
| author | Manuel Novoa III <mjn3@codepoet.org> | 2003-10-31 23:26:03 +0000 |
|---|---|---|
| committer | Manuel Novoa III <mjn3@codepoet.org> | 2003-10-31 23:26:03 +0000 |
| commit | f72338a387fe392186099c20bdd79a904965d799 (patch) | |
| tree | b6d1af405e456ec5b62be1216e039ada64f432b7 /libc | |
| parent | fff9c70e33036a80875dc25d359ef22c2c0a524c (diff) | |
Some more soft float fixes... for arm in particular (libfloat).
Remove the ADD_LIBGCC_FUNCTIONS option and do things the right way.
Either we have a shared libgcc available, or the libgcc routines
aren't PIC and don't belong in the shared libc anyway.
Diffstat (limited to 'libc')
| -rw-r--r-- | libc/Makefile | 20 | ||||
| -rw-r--r-- | libc/misc/wchar/Makefile | 2 |
2 files changed, 4 insertions, 18 deletions
diff --git a/libc/Makefile b/libc/Makefile index f93b07da9..0e3f2ead6 100644 --- a/libc/Makefile +++ b/libc/Makefile @@ -36,12 +36,6 @@ else CRTOBJS=../../lib/crt0.o endif -ifeq ($(strip $(ADD_LIBGCC_FUNCTIONS)),y) -LIBGCC_NEED=./tmp/libgcc-need.a -else -LIBGCC= -endif - DIRS = misc pwd_grp stdio string termios inet signal stdlib sysdeps unistd # Check if the target architecture has a version script for @@ -60,11 +54,11 @@ ar-target: $(LIBNAME): subdirs ar-target -shared: $(TOPDIR)lib/$(LIBNAME) $(LIBGCC_NEED) +shared: $(TOPDIR)lib/$(LIBNAME) $(LD) $(LDFLAGS) $(VERSION_SCRIPT) -soname=$(SHARED_MAJORNAME) -o $(SHARED_FULLNAME) \ - --whole-archive $(LIBGCC_NEED) $(LIBNAME) \ + --whole-archive $(LIBNAME) \ $(TOPDIR)/libc/misc/internals/interp.o --no-whole-archive \ - -init __uClibc_init $(LIBGCC) + -init __uClibc_init @true #$(RM) -r tmp $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(SHARED_FULLNAME) @@ -72,14 +66,6 @@ shared: $(TOPDIR)lib/$(LIBNAME) $(LIBGCC_NEED) $(LN) -sf $(SHARED_FULLNAME) $(TOPDIR)lib/libc.so $(LN) -sf $(SHARED_FULLNAME) $(TOPDIR)lib/$(SHARED_MAJORNAME) -$(LIBGCC_NEED): $(TOPDIR)lib/$(LIBNAME) - @$(RM) -r tmp - @mkdir tmp - $(AR) rv $@ - (cd tmp && CC="$(CC)" LD="$(LD)" LDFLAGS="$(CPU_LDFLAGS-y)" \ - NM="$(NM)" AR="$(AR)" LIBGCC="$(LIBGCC)" CRTOBJS="$(CRTOBJS)" \ - /bin/sh $(TOPDIR)../extra/scripts/get-needed-libgcc-objects.sh) - halfclean: @$(RM) $(LIBNAME) uClibc_config.h @$(RM) $(SHARED_FULLNAME) $(SHARED_MAJORNAME) uClibc-0.* libc.so* diff --git a/libc/misc/wchar/Makefile b/libc/misc/wchar/Makefile index c449e3f91..f44a9c3a5 100644 --- a/libc/misc/wchar/Makefile +++ b/libc/misc/wchar/Makefile @@ -62,7 +62,7 @@ $(MOBJ2): $(MSRC2) $(STRIPTOOL) -x -R .note -R .comment $*.o iconv.target: wchar.c - $(TARGET_CC) $(CFLAGS) -DL_iconv_main wchar.c -o $@ + $(TARGET_CC) $(CFLAGS) -DL_iconv_main wchar.c -o $@ $(LDADD_LIBFLOAT) $(STRIPTOOL) -x -R .note -R .comment $@ clean: |