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 2ef7150b96e3cd64e524311bb3fd8b1e6ee786f3..9af685c5371707904ed231d98903509b91f12e15 100644 (file)
--- 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 a56722f6ce2226c0b1ff1e4b1607c2a6189cdc54..c34ee8ea1e5c1e9eb22481b6e646a6d9969b3ce1 100644 (file)
--- 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 f9e8b8443b67c83281937bd3e6acf1f0d6dd6a50..e2d62b70dc1e856cf427df612b01900997409bb0 100644 (file)
--- 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