aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@hack.frob.com>2011-06-10 10:34:45 -0700
committerRoland McGrath <roland@hack.frob.com>2011-06-10 10:34:45 -0700
commitb350afabd9c4980a629e6bedf359d1b7b2f31375 (patch)
tree05d21e5b2a17f047afe5d22f86782b61f62d4fda
parent28368601e303e415b99ed127c5319362b1d75203 (diff)
downloadglibc-b350afabd9c4980a629e6bedf359d1b7b2f31375.zip
glibc-b350afabd9c4980a629e6bedf359d1b7b2f31375.tar.gz
glibc-b350afabd9c4980a629e6bedf359d1b7b2f31375.tar.bz2
Revert -r -> -Wl,-r change.
-rw-r--r--ChangeLog5
-rw-r--r--Makerules2
-rw-r--r--elf/Makefile5
3 files changed, 8 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 3e6cbac..3cb0de3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-10 Roland McGrath <roland@hack.frob.com>
+
+ * Makerules: Revert last change.
+ * elf/Makefile: Likewise.
+
2011-06-09 Roland McGrath <roland@hack.frob.com>
* Makerules ($(common-objpfx)libc_pic.os): Use -Wl, before -r.
diff --git a/Makerules b/Makerules
index 472948f..82ffa1e 100644
--- a/Makerules
+++ b/Makerules
@@ -610,7 +610,7 @@ endif
# between libc.so and ld.so, which can make it impossible to upgrade.
ifeq ($(elf),yes)
$(common-objpfx)libc_pic.os: $(common-objpfx)libc_pic.a
- $(LINK.o) -nostdlib -nostartfiles -Wl,-r -o $@ \
+ $(LINK.o) -nostdlib -nostartfiles -r -o $@ \
$(LDFLAGS-c_pic.os) -Wl,-d -Wl,--whole-archive $^
# Use our own special initializer and finalizer files for libc.so.
$(common-objpfx)libc.so: $(elfobjdir)/soinit.os \
diff --git a/elf/Makefile b/elf/Makefile
index 5b199e6..844c9ca 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -353,7 +353,7 @@ lib-noranlib: $(objpfx)$(rtld-installed-name) \
endif
# Command to link into a larger single relocatable object.
-reloc-link = $(LINK.o) -nostdlib -nostartfiles -Wl,-r
+reloc-link = $(LINK.o) -nostdlib -nostartfiles -r
$(objpfx)dl-allobjs.os: $(all-rtld-routines:%=$(objpfx)%.os)
$(reloc-link) -o $@ $^
@@ -398,8 +398,7 @@ $(objpfx)rtld-libc.a: $(objpfx)librtld.mk FORCE
$(MAKE) -f $< -f rtld-Rules
$(objpfx)librtld.os: $(objpfx)dl-allobjs.os $(objpfx)rtld-libc.a
- $(LINK.o) -nostdlib -nostartfiles -Wl,-r -o $@ \
- '-Wl,-(' $^ -lgcc '-Wl,-)' \
+ $(LINK.o) -nostdlib -nostartfiles -r -o $@ '-Wl,-(' $^ -lgcc '-Wl,-)' \
-Wl,-Map,$@.map
generated += librtld.map librtld.mk rtld-libc.a librtld.os.map