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-13-g2836860
- From: roland at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 10 Jun 2011 00:08:51 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-13-g2836860
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 28368601e303e415b99ed127c5319362b1d75203 (commit)
from 175b70988b3a5ff8087ff810937b3599aa6aa3ca (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=28368601e303e415b99ed127c5319362b1d75203
commit 28368601e303e415b99ed127c5319362b1d75203
Author: Roland McGrath <roland@hack.frob.com>
Date: Thu Jun 9 17:06:46 2011 -0700
Use -Wl,-r instead of plain -r.
diff --git a/ChangeLog b/ChangeLog
index 965ebe0..3e6cbac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-09 Roland McGrath <roland@hack.frob.com>
+
+ * Makerules ($(common-objpfx)libc_pic.os): Use -Wl, before -r.
+ * elf/Makefile ($(objpfx)librtld.os): Likewise.
+ (reloc-link): Likewise.
+
2011-06-09 Ulrich Drepper <drepper@gmail.com>
* elf/Makefile: Add rules to build pldd.
diff --git a/Makerules b/Makerules
index 82ffa1e..472948f 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 -r -o $@ \
+ $(LINK.o) -nostdlib -nostartfiles -Wl,-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 844c9ca..5b199e6 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 -r
+reloc-link = $(LINK.o) -nostdlib -nostartfiles -Wl,-r
$(objpfx)dl-allobjs.os: $(all-rtld-routines:%=$(objpfx)%.os)
$(reloc-link) -o $@ $^
@@ -398,7 +398,8 @@ $(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 -r -o $@ '-Wl,-(' $^ -lgcc '-Wl,-)' \
+ $(LINK.o) -nostdlib -nostartfiles -Wl,-r -o $@ \
+ '-Wl,-(' $^ -lgcc '-Wl,-)' \
-Wl,-Map,$@.map
generated += librtld.map librtld.mk rtld-libc.a librtld.os.map
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
Makerules | 2 +-
elf/Makefile | 5 +++--
3 files changed, 10 insertions(+), 3 deletions(-)
hooks/post-receive
--
GNU C Library master sources