Fix remaining explicit uses of shlib.lds to use $(shlib-lds).

diff --git a/ChangeLog b/ChangeLog
index 33b57556ce8beffbbd9c67579b6cb14d4d716b30..7198da7d94e6c983711e5271e9703e87d8be1294 100644 (file)
--- 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 6f2dfa66fa9e6a75e40a2a635232beab1c00dad1..8cfffad1d05158d602a4c3a8c61cfcb1a43cd09c 100644 (file)
--- 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 d4180999a80a33eddeb3af078e3f7d9dcdb302b4..709b61dddf54deb1cc32bd419b27fe43dd8970dd 100644 (file)
--- 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 $@ $^