aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog13
-rw-r--r--elf/Makefile5
2 files changed, 15 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 402ba95..34d9fd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,20 @@
+2002-08-20 Jakub Jelinek <jakub@redhat.com>
+
+ * 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>.
+
2002-08-20 Ulrich Drepper <drepper@redhat.com>
* include/unistd.h: Don't hide _exit.
* elf/rtld.c (_dl_start): Pass extra argument 1 to TLS_INIT_TP.
- (dl_main): Padd extra argument 0 to TLS_INIT_TP.
+ (dl_main): Pass extra argument 0 to TLS_INIT_TP.
* sysdeps/generic/libc-tls.c (__libc_setup_tls): Pass extra
argument 1 to TLS_INIT_TP.
* sysdeps/generic/tls.h (TLS_INIT_TP): Describe new parameter.
diff --git a/elf/Makefile b/elf/Makefile
index 1d059f4..ce38d2d 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.