aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2002-08-20 19:40:17 +0000
committerRoland McGrath <roland@gnu.org>2002-08-20 19:40:17 +0000
commit070cadeb5ff502d0fd57b6241b65d3724a70d0d0 (patch)
treec709f637594d7ce444469cae05c05dd026674d40 /elf
parentb5560a4483a8dad8ea53fca08203f581a6507121 (diff)
downloadglibc-070cadeb5ff502d0fd57b6241b65d3724a70d0d0.tar
glibc-070cadeb5ff502d0fd57b6241b65d3724a70d0d0.tar.gz
glibc-070cadeb5ff502d0fd57b6241b65d3724a70d0d0.tar.bz2
glibc-070cadeb5ff502d0fd57b6241b65d3724a70d0d0.zip
* locale/loadarchive.c (_nl_load_locale_from_archive): Handle
partially overlapping mappings. Remove unneeded (char *) casts. Never allow duplication of ranges in mapped areas. 2002-08-20 Roland McGrath <roland@redhat.com> * elf/Makefile ($(objpfx)ld.so): Separate commands in rule so errors can be detected by make. Reported by H.J. Lu <hjl@gnu.org>. (dl_main): Pass extra argument 0 to TLS_INIT_TP.
Diffstat (limited to 'elf')
-rw-r--r--elf/Makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/elf/Makefile b/elf/Makefile
index 1d059f4b31..ce38d2da72 100644
--- a/elf/Makefile
+++ b/elf/Makefile
@@ -168,14 +168,15 @@ $(objpfx)librtld.os: $(objpfx)dl-allobjs.os $(common-objpfx)libc_pic.a
$(reloc-link) '-Wl,-(' $^ -lgcc '-Wl,-)'
$(objpfx)ld.so: $(objpfx)librtld.os $(ld-map)
+ @rm -f $@.lds
$(LINK.o) -nostdlib -nostartfiles -shared \
$(LDFLAGS-rtld) -Wl,--verbose 2>&1 | \
sed -e '/^=========/,/^=========/!d;/^=========/d' \
-e 's/\. = 0 + SIZEOF_HEADERS;/& _begin = . - SIZEOF_HEADERS;/' \
- > $@.lds; \
+ > $@.lds
$(LINK.o) -nostdlib -nostartfiles -shared -o $@ $(LDFLAGS-rtld) \
$(filter-out $(map-file),$^) $(load-map-file) \
- -Wl,-soname=$(rtld-installed-name) -T $@.lds; \
+ -Wl,-soname=$(rtld-installed-name) -T $@.lds
rm -f $@.lds
# interp.c exists just to get this string into the libraries.