about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2005-02-12 23:17:03 +0000
committerUlrich Drepper <drepper@redhat.com>2005-02-12 23:17:03 +0000
commite38c954b3bebd37f7519202d918cf0f1edbdd182 (patch)
tree10448433c1c86e4af4417a5942eb0cb3a5847f6e
parentf85f3563dbe640fb1cdb2f8a98c1101e424cb5bc (diff)
downloadglibc-e38c954b3bebd37f7519202d918cf0f1edbdd182.tar.gz
glibc-e38c954b3bebd37f7519202d918cf0f1edbdd182.tar.xz
glibc-e38c954b3bebd37f7519202d918cf0f1edbdd182.zip
* 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.
-rw-r--r--ChangeLog11
-rw-r--r--debug/chk_fail.c6
-rw-r--r--elf/rtld.c11
3 files changed, 22 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 2be28bacb5..78927b47ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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)
 	    {