summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManuel Novoa III <mjn3@codepoet.org>2004-01-16 18:52:54 (GMT)
committerManuel Novoa III <mjn3@codepoet.org>2004-01-16 18:52:54 (GMT)
commitd8c8b456f45c773d0adac99f2997cbb0cab4c911 (patch)
treef4112b6f99e0b264701feba735e79a20bd6990c9
parent338237994ac93ca58f6024ef0f7932ab770735d1 (diff)
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.
-rw-r--r--ldso/libdl/Makefile2
-rw-r--r--libcrypt/Makefile2
-rw-r--r--libintl/Makefile2
-rw-r--r--libm/Makefile2
-rw-r--r--libnsl/Makefile2
-rw-r--r--libpthread/Makefile6
-rw-r--r--libresolv/Makefile2
-rw-r--r--libutil/Makefile2
8 files changed, 11 insertions, 9 deletions
diff --git a/ldso/libdl/Makefile b/ldso/libdl/Makefile
index fa7d712..6e4d6a2 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 1c1777c..afe20f7 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 8083897..d52409e 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 b2d1233..9ca4f14 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 e7ff6e0..1d1b9a5 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 189cdff..ef68cfa 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 180b632..d575363 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 4f819e7..a31f1ed 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