From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 16 Jan 2004 03:03:47 +0000 (+0000)
Subject: Update.
X-Git-Tag: upstream/2.20~11388
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39b04aa39823faf1cc414e7f3eca4f43e01426e4;p=platform%2Fupstream%2Flinaro-glibc.git

Update.

2004-01-15  Ulrich Drepper  <drepper@redhat.com>

	* elf/rtld.c: Handle platforms with HP_TIMING_NONAVAIL defined.
---

diff --git a/ChangeLog b/ChangeLog
index ed1f00a..a4cf968 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-15  Ulrich Drepper  <drepper@redhat.com>
+
+	* elf/rtld.c: Handle platforms with HP_TIMING_NONAVAIL defined.
+
 2004-01-16  Alfred M. Szmidt  <ams@kemisten.nu>
 
 	* sysdeps/generic/dl-execstack.c (_dl_make_stack_executable): Adjust
diff --git a/elf/rtld.c b/elf/rtld.c
index 803d586..62c997a 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -277,7 +277,13 @@ _dl_start_final (void *arg, struct dl_start_final_info *info)
 #endif
 
   if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_STATISTICS, 0))
-    print_statistics (&rtld_total_time);
+    {
+#ifndef HP_TIMING_NONAVAIL
+      print_statistics (&rtld_total_time);
+#else
+      print_statistics (NULL);
+#endif
+    }
 
   return start_addr;
 }