From d8c8b456f45c773d0adac99f2997cbb0cab4c911 Mon Sep 17 00:00:00 2001 From: Manuel Novoa III Date: Fri, 16 Jan 2004 18:52:54 +0000 Subject: We need to link with libgcc.a when creating shared libs, in order to avoid problems 'hidden symbol' problems. Also handle -lfloat for the soft-float arm case. --- ldso/libdl/Makefile | 2 +- libcrypt/Makefile | 2 +- libintl/Makefile | 2 +- libm/Makefile | 2 +- libnsl/Makefile | 2 +- libpthread/Makefile | 6 ++++-- libresolv/Makefile | 2 +- libutil/Makefile | 2 +- 8 files changed, 11 insertions(+), 9 deletions(-) diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile index fa7d7129d..6e4d6a242 100644 --- a/ldso/libdl/Makefile +++ b/ldso/libdl/Makefile @@ -75,7 +75,7 @@ shared: $(LD) $(LDFLAGS) -soname=$(LIBDL_SHARED).$(MAJOR_VERSION) \ -o $(LIBDL_SHARED_FULLNAME) --whole-archive $(LIBDL_PIC) \ --no-whole-archive $(TOPDIR)/libc/misc/internals/interp.o \ - -L$(TOPDIR)/lib -lc; + -L$(TOPDIR)/lib -lc $(LDADD_LIBFLOAT) $(LIBGCC); $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBDL_SHARED).$(MAJOR_VERSION) $(INSTALL) -m 644 $(LIBDL_SHARED_FULLNAME) $(TOPDIR)lib diff --git a/libcrypt/Makefile b/libcrypt/Makefile index 1c1777cf1..afe20f786 100644 --- a/libcrypt/Makefile +++ b/libcrypt/Makefile @@ -51,7 +51,7 @@ shared: all $(LD) $(LDFLAGS) -soname=$(LIBCRYPT_SHARED).$(MAJOR_VERSION) \ -o $(LIBCRYPT_SHARED_FULLNAME) --whole-archive $(LIBCRYPT) \ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \ - -L$(TOPDIR)lib -lc; + -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC); $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBCRYPT_SHARED).$(MAJOR_VERSION) $(INSTALL) -m 644 $(LIBCRYPT_SHARED_FULLNAME) $(TOPDIR)lib; diff --git a/libintl/Makefile b/libintl/Makefile index 8083897bd..d52409ed9 100644 --- a/libintl/Makefile +++ b/libintl/Makefile @@ -54,7 +54,7 @@ shared: all $(LD) $(LDFLAGS) -soname=$(LIBINTL_SHARED).$(MAJOR_VERSION) \ -o $(LIBINTL_SHARED_FULLNAME) --whole-archive $(LIBINTL) \ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \ - -L$(TOPDIR)lib -lc; + -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC); $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBINTL_SHARED).$(MAJOR_VERSION) $(INSTALL) -m 644 $(LIBINTL_SHARED_FULLNAME) $(TOPDIR)lib diff --git a/libm/Makefile b/libm/Makefile index b2d123370..9ca4f14a0 100644 --- a/libm/Makefile +++ b/libm/Makefile @@ -99,7 +99,7 @@ shared: all $(LD) $(LDFLAGS) -soname=$(LIBM_SHARED).$(MAJOR_VERSION) \ -o $(LIBM_SHARED_FULLNAME) --whole-archive $(LIBM) \ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \ - -L$(TOPDIR)lib -lc; \ + -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC); \ $(INSTALL) -d $(TOPDIR)lib; \ $(RM) $(TOPDIR)lib/$(LIBM_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBM_SHARED).$(MAJOR_VERSION); \ $(INSTALL) -m 644 $(LIBM_SHARED_FULLNAME) $(TOPDIR)lib; \ diff --git a/libnsl/Makefile b/libnsl/Makefile index e7ff6e018..1d1b9a53a 100644 --- a/libnsl/Makefile +++ b/libnsl/Makefile @@ -46,7 +46,7 @@ shared: all $(LD) $(LDFLAGS) -soname=$(LIBNSL_SHARED).$(MAJOR_VERSION) \ -o $(LIBNSL_SHARED_FULLNAME) --whole-archive $(LIBNSL) \ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \ - -L$(TOPDIR)lib -lc; + -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC); $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBNSL_SHARED).$(MAJOR_VERSION) $(INSTALL) -m 644 $(LIBNSL_SHARED_FULLNAME) $(TOPDIR)lib diff --git a/libpthread/Makefile b/libpthread/Makefile index 189cdffc2..ef68cfa69 100644 --- a/libpthread/Makefile +++ b/libpthread/Makefile @@ -81,7 +81,8 @@ shared: all $(LD) $(LDFLAGS_PTHREADS) -soname=$(LIBPTHREAD_SHARED).$(MAJOR_VERSION) \ -o $(LIBPTHREAD_SHARED_FULLNAME) $(START_FILES) --whole-archive $(LIBPTHREAD) \ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \ - -L$(TOPDIR)lib -lc $(END_FILES); \ + -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) \ + $(END_FILES); \ $(INSTALL) -d $(TOPDIR)lib; \ $(RM) $(TOPDIR)lib/$(LIBPTHREAD_SHARED_FULLNAME) \ $(TOPDIR)lib/$(LIBPTHREAD_SHARED).$(MAJOR_VERSION); \ @@ -96,7 +97,8 @@ shared: all $(LD) $(LDFLAGS) -soname=$(LIBTHREAD_DB_SHARED).1 \ -o $(LIBTHREAD_DB_SHARED_FULLNAME) $(START_FILES) --whole-archive $(LIBTHREAD_DB) \ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \ - -L$(TOPDIR)lib -lc $(END_FILES); \ + -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC) \ + $(END_FILES); \ $(INSTALL) -d $(TOPDIR)lib; \ $(RM) $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED_FULLNAME) \ $(TOPDIR)lib/$(LIBTHREAD_DB_SHARED).$(MAJOR_VERSION); \ diff --git a/libresolv/Makefile b/libresolv/Makefile index 180b632fa..d575363c0 100644 --- a/libresolv/Makefile +++ b/libresolv/Makefile @@ -52,7 +52,7 @@ shared: all $(LD) $(LDFLAGS) -soname=$(LIBRESOLV_SHARED).$(MAJOR_VERSION) \ -o $(LIBRESOLV_SHARED_FULLNAME) --whole-archive $(LIBRESOLV) \ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \ - -L$(TOPDIR)lib -lc; + -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC); $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBRESOLV_SHARED).$(MAJOR_VERSION) $(INSTALL) -m 644 $(LIBRESOLV_SHARED_FULLNAME) $(TOPDIR)lib diff --git a/libutil/Makefile b/libutil/Makefile index 4f819e73e..a31f1ed8f 100644 --- a/libutil/Makefile +++ b/libutil/Makefile @@ -53,7 +53,7 @@ shared: all $(LD) $(LDFLAGS) -soname=$(LIBUTIL_SHARED).$(MAJOR_VERSION) \ -o $(LIBUTIL_SHARED_FULLNAME) --whole-archive $(LIBUTIL) \ --no-whole-archive $(TOPDIR)libc/misc/internals/interp.o \ - -L$(TOPDIR)lib -lc; + -L$(TOPDIR)lib -lc $(LDADD_LIBFLOAT) $(LIBGCC); $(INSTALL) -d $(TOPDIR)lib $(RM) $(TOPDIR)lib/$(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib/$(LIBUTIL_SHARED).$(MAJOR_VERSION) $(INSTALL) -m 644 $(LIBUTIL_SHARED_FULLNAME) $(TOPDIR)lib -- cgit v1.2.3