diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | elf/rtld.c | 26 | ||||
| -rw-r--r-- | sysdeps/generic/hp-timing.h | 5 |
4 files changed, 38 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog index ff2972e4cd..4b92f4655c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,19 @@ 2000-04-17 Ulrich Drepper <drepper@redhat.com> + * sysdeps/generic/hp-timing.h (HP_TIMING_NONAVAIL): Define to + signal timing is not really implemented. + +2000-04-17 Andreas Jaeger <aj@suse.de> + + * elf/rtld.c (process_dl_debug): Mention statistics in help message. + +2000-04-17 Jakub Jelinek <jakub@redhat.com> + + * Makefile (install): Use slibdir and libdir instead of inst_slibdir + and inst_libdir. + +2000-04-17 Ulrich Drepper <drepper@redhat.com> + * manual/intro.texi: Change reference from System Information to System Management. * manual/users.texi: Likewise. diff --git a/Makefile b/Makefile index cd2614935e..6e4a7670ba 100644 --- a/Makefile +++ b/Makefile @@ -107,7 +107,7 @@ install-symbolic-link: subdir_install install: -test ! -x $(common-objpfx)elf/ldconfig || \ $(common-objpfx)elf/ldconfig $(addprefix -r ,$(install_root)) \ - $(inst_slibdir) $(inst_libdir) + $(slibdir) $(libdir) ifneq (no,$(PERL)) ifeq (/usr,$(prefix)) ifeq (,$(install_root)) diff --git a/elf/rtld.c b/elf/rtld.c index 46732ba912..6e33969faa 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -134,9 +134,11 @@ struct libname_list _dl_rtld_libname; struct libname_list _dl_rtld_libname2; /* Variable for statistics. */ +#ifndef HP_TIMING_NONAVAIL static hp_timing_t rtld_total_time; static hp_timing_t relocate_time; static hp_timing_t load_time; +#endif extern unsigned long int _dl_num_relocations; /* in dl-lookup.c */ static ElfW(Addr) _dl_start_final (void *arg, struct link_map *bootstrap_map_p, @@ -377,9 +379,11 @@ dl_main (const ElfW(Phdr) *phdr, int has_interp = 0; unsigned int i; int rtld_is_main = 0; +#ifndef HP_TIMING_NONAVAIL hp_timing_t start; hp_timing_t stop; hp_timing_t diff; +#endif /* Process the environment variable which control the behaviour. */ process_envvars (&mode, &_dl_lazy); @@ -1177,16 +1181,24 @@ process_dl_debug (const char *dl_debug) case 4: if (memcmp (dl_debug, "help", 4) == 0) { + /* The `statistics' flag is not always implemented. */ +#ifdef HP_TIMING_NONAVAIL +# define LD_DEBUG_STATISTICS_TEXT +#else +# define LD_DEBUG_STATISTICS_TEXT \ +" statistics display relocation statistics\n" +#endif _dl_sysdep_message ("\ Valid options for the LD_DEBUG environment variable are:\n\ \n\ - bindings display information about symbol binding\n\ - files display processing of files and libraries\n\ - help display this help message and exit\n\ - libs display library search paths\n\ - reloc display relocation processing\n\ - symbols display symbol table processing\n\ - versions display version dependencies\n\ + bindings display information about symbol binding\n\ + files display processing of files and libraries\n\ + help display this help message and exit\n\ + libs display library search paths\n\ + reloc display relocation processing\n" +LD_DEBUG_STATISTICS_TEXT +" symbols display symbol table processing\n\ + versions display version dependencies\n\ \n\ To direct the debugging output into a file instead of standard output\n\ a filename can be specified using the LD_DEBUG_OUTPUT environment variable.\n", diff --git a/sysdeps/generic/hp-timing.h b/sysdeps/generic/hp-timing.h index 35f3291e63..e9e4e2d827 100644 --- a/sysdeps/generic/hp-timing.h +++ b/sysdeps/generic/hp-timing.h @@ -1,5 +1,5 @@ /* High precision, low overhead timing functions. Generic version. - Copyright (C) 1998 Free Software Foundation, Inc. + Copyright (C) 1998, 2000 Free Software Foundation, Inc. This file is part of the GNU C Library. Contributed by Ulrich Drepper <drepper@cygnus.com>, 1998. @@ -77,4 +77,7 @@ typedef int hp_timing_t; #define HP_TIMING_ACCUM_NT(Sum, Diff) #define HP_TIMING_PRINT(Buf, Len, Val) +/* Since this implementation is not available we tell the user about it. */ +#define HP_TIMING_NONAVAIL 1 + #endif /* hp-timing.h */ |