diff options
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | debug/chk_fail.c | 6 | ||||
| -rw-r--r-- | elf/rtld.c | 11 |
3 files changed, 22 insertions, 6 deletions
@@ -1,3 +1,14 @@ +2005-02-11 Jakub Jelinek <jakub@redhat.com> + + * debug/chk_fail.c (__chk_fail): Add a while (1) loop around + __libc_message to kill GCC warning about noreturn function returning. + + * elf/rtld.c (dlmain): If LD_TRACE_PRELINKING, clear l_relocated flag + before relocating ld.so again. + + * elf/rtld.c (_dl_start): Set bootstrap_map.l_relocated even + for already prelinked ld.so. + 2005-02-11 Roland McGrath <roland@redhat.com> [BZ #715] diff --git a/debug/chk_fail.c b/debug/chk_fail.c index 29df08b9ca..6921ca4686 100644 --- a/debug/chk_fail.c +++ b/debug/chk_fail.c @@ -26,7 +26,9 @@ void __attribute__ ((noreturn)) __chk_fail (void) { - __libc_message (1, "*** buffer overflow detected ***: %s terminated\n", - __libc_argv[0] ?: "<unknown>"); + /* The loop is added only to keep gcc happy. */ + while (1) + __libc_message (1, "*** buffer overflow detected ***: %s terminated\n", + __libc_argv[0] ?: "<unknown>"); } libc_hidden_def (__chk_fail) diff --git a/elf/rtld.c b/elf/rtld.c index 6a1216d12d..fbb4e4c3f2 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -1919,10 +1919,13 @@ ERROR: ld.so: object '%s' from %s cannot be preloaded: ignored.\n", if ((GLRO(dl_debug_mask) & DL_DEBUG_PRELINK) && GL(dl_rtld_map).l_opencount > 1) - _dl_relocate_object (&GL(dl_rtld_map), main_map->l_scope, - 0, 0); - } - + { + /* Mark the link map as not yet relocated again. */ + GL(dl_rtld_map).l_relocated = 0; + _dl_relocate_object (&GL(dl_rtld_map), main_map->l_scope, + 0, 0); + } + } #define VERNEEDTAG (DT_NUM + DT_THISPROCNUM + DT_VERSIONTAGIDX (DT_VERNEED)) if (version_info) { |