2000-04-20 Andreas Jaeger <aj@suse.de>

	* elf/rtld.c (print_statistics): Move ifndef further up.
	(_dl_start_final): Added HP_TIMINIG_NONAVAIL to avoid warnings.
	(dl_main): Likewise.
2000-04-20  Andreas Jaeger  <aj@suse.de>

	* elf/rtld.c (print_statistics): Move ifndef further up.
	(_dl_start_final): Added HP_TIMINIG_NONAVAIL to avoid warnings.
	(dl_main): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 58127c3088321848d831e593db517aa435a52bd0..d93ca18a0d16b29223c0f27eb0c75de64ca17185 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-20  Andreas Jaeger  <aj@suse.de>
+
+       * elf/rtld.c (print_statistics): Move ifndef further up.
+       (_dl_start_final): Added HP_TIMINIG_NONAVAIL to avoid warnings.
+       (dl_main): Likewise.
+
 2000-04-18  Ulrich Drepper  <drepper@redhat.com>
 
        * gmon/gmon.c: Add weak alias moncontrol for __moncontrol.

diff --git a/elf/rtld.c b/elf/rtld.c
index 84cfbfb7f1d5dccf6fd263b3295aad5205ecd05a..c3363ade319a89425b0f7514c8a557d1a589b9e7 100644 (file)
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -241,7 +241,7 @@ _dl_start_final (void *arg, struct link_map *bootstrap_map_p,
      of the dynamic linker, and then unwind our frame and run the user
      entry point on the same stack we entered on.  */
   *start_addr =  _dl_sysdep_start (arg, &dl_main);
-
+#ifndef HP_TIMING_NONAVAIL
   if (HP_TIMING_AVAIL)
     {
       hp_timing_t end_time;
@@ -252,6 +252,7 @@ _dl_start_final (void *arg, struct link_map *bootstrap_map_p,
       /* Compute the difference.  */
       HP_TIMING_DIFF (rtld_total_time, start_time, end_time);
     }
+#endif
 
   if (__builtin_expect (_dl_debug_statistics, 0))
     print_statistics ();
@@ -1018,9 +1019,11 @@ of this helper program; chances are you did not intend to run this program.\n\
 
     struct link_map *l;
     int consider_profiling = _dl_profile != NULL;
+#ifndef HP_TIMING_NONAVAIL
     hp_timing_t start;
     hp_timing_t stop;
     hp_timing_t add;
+#endif
 
     /* If we are profiling we also must do lazy reloaction.  */
     _dl_lazy |= consider_profiling;
@@ -1466,6 +1469,7 @@ static void
 print_statistics (void)
 {
   char buf[200];
+#ifndef HP_TIMING_NONAVAIL
   char *cp;
   char *wp;
 
@@ -1479,7 +1483,6 @@ print_statistics (void)
     }
 
   /* Print relocation statistics.  */
-#ifndef HP_TIMING_NONAVAIL
   if (HP_TIMING_AVAIL)
     {
       HP_TIMING_PRINT (buf, sizeof (buf), relocate_time);