OpenE2K
/
glibc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert -r -> -Wl,-r change.

This commit is contained in:
Roland McGrath 2011-06-10 10:34:45 -07:00
parent 28368601e3
commit b350afabd9
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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.

2
Makerules
View File

@ -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 \

5
elf/Makefile
View File

@ -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