aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Makefile2
-rw-r--r--elf/Makefile4
3 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 33b57556ce..7198da7d94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2011-07-14 Roland McGrath <roland@hack.frob.com>
+ * Makefile ($(common-objpfx)linkobj/libc.so): Use $(shlib-lds) instead
+ of $(common-objpfx)shlib.lds.
+ * elf/Makefile ($(objpfx)sotruss-lib.so): Likewise.
+
* sysdeps/i386/i686/multiarch/strstr-c.c (libc_hidden_builtin_def):
Conditionalize redefinition on [SHARED && DO_VERSIONING && !NO_HIDDEN].
diff --git a/Makefile b/Makefile
index 6f2dfa66fa..8cfffad1d0 100644
--- a/Makefile
+++ b/Makefile
@@ -143,7 +143,7 @@ $(common-objpfx)linkobj/libc.so: $(elfobjdir)/soinit.os \
$(elfobjdir)/sofini.os \
$(elfobjdir)/interp.os \
$(elfobjdir)/ld.so \
- $(common-objpfx)shlib.lds
+ $(shlib-lds)
$(build-shlib)
$(common-objpfx)linkobj/libc_pic.a: $(common-objpfx)libc_pic.a \
diff --git a/elf/Makefile b/elf/Makefile
index d4180999a8..709b61dddf 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -178,7 +178,7 @@ install-others += $(inst_auditdir)/sotruss-lib.so
install-bin-script += sotruss
generated += sotruss
CPPFLAGS-sotruss-lib = -DNOT_IN_libc
-$(objpfx)sotruss-lib.so: $(objpfx)sotruss-lib.os $(common-objpfx)shlib.lds
+$(objpfx)sotruss-lib.so: $(objpfx)sotruss-lib.os
$(build-module-asneeded)
$(objpfx)sotruss-lib.so: $(common-objpfx)libc.so $(objpfx)ld.so \
$(common-objpfx)libc_nonshared.a
@@ -355,6 +355,8 @@ endif
# Command to link into a larger single relocatable object.
reloc-link = $(LINK.o) -nostdlib -nostartfiles -r
+$(objpfx)sotruss-lib.so: $(shlib-lds)
+
$(objpfx)dl-allobjs.os: $(all-rtld-routines:%=$(objpfx)%.os)
$(reloc-link) -o $@ $^