From 35fc382add7924e79b9dc706125593c14905a425 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 28 Feb 2001 06:36:10 +0000 Subject: Update. * sysdeps/arm/dl-machine.h: Likewise. * sysdeps/hppa/dl-machine.h: Likewise. * sysdeps/m68k/dl-machine.h: Likewise. * sysdeps/powerpc/dl-machine.h: Likewise. * sysdeps/s390/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. --- elf/dl-lookup.c | 61 ++++++++++++++++++++++++--------------------------------- 1 file changed, 26 insertions(+), 35 deletions(-) (limited to 'elf/dl-lookup.c') diff --git a/elf/dl-lookup.c b/elf/dl-lookup.c index 5ef9345..f8bb9e1 100644 --- a/elf/dl-lookup.c +++ b/elf/dl-lookup.c @@ -162,12 +162,11 @@ add_dependency (struct link_map *undef_map, struct link_map *map) /* Display information if we are debugging. */ if (__builtin_expect (_dl_debug_mask & DL_DEBUG_FILES, 0)) - _dl_debug_message (1, "\nfile=", - map->l_name[0] ? map->l_name : _dl_argv[0], - "; needed by ", - undef_map->l_name[0] - ? undef_map->l_name : _dl_argv[0], - " (relocation dependency)\n\n", NULL); + _dl_debug_printf ("\ +\nfile=%s; needed by %s (relocation dependency)\n\n", + map->l_name[0] ? map->l_name : _dl_argv[0], + undef_map->l_name[0] + ? undef_map->l_name : _dl_argv[0]); } else /* Whoa, that was bad luck. We have to search again. */ @@ -243,14 +242,12 @@ _dl_lookup_symbol (const char *undef_name, struct link_map *undef_map, protected = *ref && ELFW(ST_VISIBILITY) ((*ref)->st_other) == STV_PROTECTED; if (__builtin_expect (_dl_debug_mask & DL_DEBUG_BINDINGS, 0)) - _dl_debug_message (1, "binding file ", - (reference_name && reference_name[0] - ? reference_name - : (_dl_argv[0] ?: "
")), - " to ", current_value.m->l_name[0] + _dl_debug_printf ("binding file %s to %s: %s symbol `%s'\n", + (reference_name && reference_name[0] + ? reference_name : (_dl_argv[0] ?: "
")), + current_value.m->l_name[0] ? current_value.m->l_name : _dl_argv[0], - ": ", protected ? "protected" : "normal", - " symbol `", undef_name, "'\n", NULL); + protected ? "protected" : "normal", undef_name); if (__builtin_expect (protected == 0, 1)) { @@ -322,14 +319,12 @@ _dl_lookup_symbol_skip (const char *undef_name, protected = *ref && ELFW(ST_VISIBILITY) ((*ref)->st_other) == STV_PROTECTED; if (__builtin_expect (_dl_debug_mask & DL_DEBUG_BINDINGS, 0)) - _dl_debug_message (1, "binding file ", + _dl_debug_printf ("binding file %s to %s: %s symbol `%s'\n", (reference_name && reference_name[0] - ? reference_name - : (_dl_argv[0] ?: "
")), - " to ", current_value.m->l_name[0] + ? reference_name : (_dl_argv[0] ?: "
")), + current_value.m->l_name[0] ? current_value.m->l_name : _dl_argv[0], - ": ", protected ? "protected" : "normal", - " symbol `", undef_name, "'\n", NULL); + protected ? "protected" : "normal", undef_name); if (__builtin_expect (protected == 0, 1)) { @@ -450,15 +445,13 @@ _dl_lookup_versioned_symbol (const char *undef_name, protected = *ref && ELFW(ST_VISIBILITY) ((*ref)->st_other) == STV_PROTECTED; if (__builtin_expect (_dl_debug_mask & DL_DEBUG_BINDINGS, 0)) - _dl_debug_message (1, "binding file ", + _dl_debug_printf ("binding file %s to %s: %s symbol `%s' [%s]\n", (reference_name && reference_name[0] - ? reference_name - : (_dl_argv[0] ?: "
")), - " to ", current_value.m->l_name[0] + ? reference_name : (_dl_argv[0] ?: "
")), + current_value.m->l_name[0] ? current_value.m->l_name : _dl_argv[0], - ": ", protected ? "protected" : "normal", - " symbol `", undef_name, "' [", version->name, - "]\n", NULL); + protected ? "protected" : "normal", + undef_name, version->name); if (__builtin_expect (protected == 0, 1)) { @@ -541,15 +534,13 @@ _dl_lookup_versioned_symbol_skip (const char *undef_name, protected = *ref && ELFW(ST_VISIBILITY) ((*ref)->st_other) == STV_PROTECTED; if (__builtin_expect (_dl_debug_mask & DL_DEBUG_BINDINGS, 0)) - _dl_debug_message (1, "binding file ", - (reference_name && reference_name[0] - ? reference_name - : (_dl_argv[0] ?: "
")), - " to ", current_value.m->l_name[0] - ? current_value.m->l_name : _dl_argv[0], - ": ", protected ? "protected" : "normal", - " symbol `", undef_name, "' [", version->name, - "]\n", NULL); + _dl_debug_printf ("binding file %s to %s: %s symbol `%s' [%s]\n", + (reference_name && reference_name[0] + ? reference_name : (_dl_argv[0] ?: "
")), + current_value.m->l_name[0] + ? current_value.m->l_name : _dl_argv[0], + protected ? "protected" : "normal", + undef_name, version->name); if (__builtin_expect (protected == 0, 1)) { -- cgit v1.1