From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 6 Mar 2004 09:15:58 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-base~735
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42af49f875e2d0a8cdcf575fbd3a06c12be6468e;p=thirdparty%2Fglibc.git

Update.

	* elf/dl-fini.c (_dl_fini): Combine _dl_debug_printf calls.
	* elf/rtld.c (print_statistics): Likewise.
---

diff --git a/ChangeLog b/ChangeLog
index 2ef7150b96e..9af685c5371 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2004-03-06  Ulrich Drepper  <drepper@redhat.com>
 
+	* elf/dl-fini.c (_dl_fini): Combine _dl_debug_printf calls.
+	* elf/rtld.c (print_statistics): Likewise.
+
 	* elf/dl-open.c: No need to pass any parameter to _dl_start_profile.
 	They are the same in both places.
 	* elf/dl-profile.c: Likewise.
diff --git a/elf/dl-fini.c b/elf/dl-fini.c
index a56722f6ce2..c34ee8ea1e5 100644
--- a/elf/dl-fini.c
+++ b/elf/dl-fini.c
@@ -174,13 +174,9 @@ _dl_fini (void)
   __rtld_lock_unlock_recursive (GL(dl_load_lock));
 
   if (__builtin_expect (GLRO(dl_debug_mask) & DL_DEBUG_STATISTICS, 0))
-    {
-      _dl_debug_printf ("\nruntime linker statistics:\n");
-      _dl_debug_printf ("\
-           final number of relocations: %lu\n",
-			GL(dl_num_relocations));
-      _dl_debug_printf ("\
-final number of relocations from cache: %lu\n",
-			GL(dl_num_cache_relocations));
-    }
+    _dl_debug_printf ("\nruntime linker statistics:\n"
+		      "           final number of relocations: %lu\n"
+		      "final number of relocations from cache: %lu\n",
+		      GL(dl_num_relocations),
+		      GL(dl_num_cache_relocations));
 }
diff --git a/elf/rtld.c b/elf/rtld.c
index f9e8b8443b6..e2d62b70dc1 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -2266,11 +2266,11 @@ print_statistics (hp_timing_t *rtld_total_timep)
 	num_relative_relocations += l->l_info[VERSYMIDX (DT_RELACOUNT)]->d_un.d_val;
     }
 
-  _dl_debug_printf ("                 number of relocations: %lu\n",
-		    GL(dl_num_relocations));
-  _dl_debug_printf ("      number of relocations from cache: %lu\n",
-		    GL(dl_num_cache_relocations));
-  _dl_debug_printf ("        number of relative relocations: %lu\n",
+  _dl_debug_printf ("                 number of relocations: %lu\n"
+		    "      number of relocations from cache: %lu\n"
+		    "        number of relative relocations: %lu\n",
+		    GL(dl_num_relocations),
+		    GL(dl_num_cache_relocations),
 		    num_relative_relocations);
 
 #ifndef HP_TIMING_NONAVAIL