about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2004-01-16 03:03:47 +0000
committerUlrich Drepper <drepper@redhat.com>2004-01-16 03:03:47 +0000
commit39b04aa39823faf1cc414e7f3eca4f43e01426e4 (patch)
treeba0677ad81e005121e537fadff4088db3a334e1c
parentd8e36e001c7e276d17b911d9c4eabe33358a3ed0 (diff)
downloadglibc-39b04aa39823faf1cc414e7f3eca4f43e01426e4.tar.gz
glibc-39b04aa39823faf1cc414e7f3eca4f43e01426e4.tar.xz
glibc-39b04aa39823faf1cc414e7f3eca4f43e01426e4.zip
Update.
2004-01-15  Ulrich Drepper  <drepper@redhat.com>

	* elf/rtld.c: Handle platforms with HP_TIMING_NONAVAIL defined.
-rw-r--r--ChangeLog4
-rw-r--r--elf/rtld.c8
2 files changed, 11 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index ed1f00aec4..a4cf96803d 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 803d586dea..62c997a00c 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;
 }