diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2000-04-18 06:35:08 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2000-04-18 06:35:08 +0000 |
| commit | 5732c4df916d57ac0ada6817653c13b8d4f19783 (patch) | |
| tree | e2aad0964509f273cf160d53cc6e5a11c0ae334e /elf/rtld.c | |
| parent | faf2289fa14a6d1c7d9ccb40bcefd92c3e55d517 (diff) | |
| download | glibc-5732c4df916d57ac0ada6817653c13b8d4f19783.tar.gz glibc-5732c4df916d57ac0ada6817653c13b8d4f19783.tar.xz glibc-5732c4df916d57ac0ada6817653c13b8d4f19783.zip | |
Update.
* 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>
Diffstat (limited to 'elf/rtld.c')
| -rw-r--r-- | elf/rtld.c | 26 |
1 files changed, 19 insertions, 7 deletions
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", |