This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch, master, updated. glibc-2.14-14-gb350afa
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 10 Jun 2011 17:34:57 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-14-gb350afa
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via b350afabd9c4980a629e6bedf359d1b7b2f31375 (commit)
from 28368601e303e415b99ed127c5319362b1d75203 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=b350afabd9c4980a629e6bedf359d1b7b2f31375
commit b350afabd9c4980a629e6bedf359d1b7b2f31375
Author: Roland McGrath <roland@hack.frob.com>
Date: Fri Jun 10 10:34:45 2011 -0700
Revert -r -> -Wl,-r change.
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
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
Makerules | 2 +-
elf/Makefile | 5 ++---
3 files changed, 8 insertions(+), 4 deletions(-)
hooks/post-receive
--
GNU C Library master sources