lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

Update.

Browse Source 
* elf/dl-error.c: Likewise.
	* elf/dl-fini.c: Likewise.
	* elf/dl-runtime.c: Likewise.
	* elf/do-lookup.h: Likewise.
This commit is contained in:
Andreas Jaeger
2002-02-06 14:19:54 +00:00
parent cff26a3ed5
commit 64b6bd34ef
6 changed files with 44 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -10,6 +10,10 @@
* elf/dl-load.c: Likewise. * elf/dl-load.c: Likewise.
* elf/dl-dst.h: Likewise. * elf/dl-dst.h: Likewise.
* elf/dl-init.c: Likewise. * elf/dl-init.c: Likewise.
* elf/dl-error.c: Likewise.
* elf/dl-fini.c: Likewise.
* elf/dl-runtime.c: Likewise.
* elf/do-lookup.h: Likewise.
* stdio-common/_itoa.h: Undefine SPECIAL to avoid duplicate * stdio-common/_itoa.h: Undefine SPECIAL to avoid duplicate
definition. definition.

2
elf/dl-error.c
View File

@ -126,7 +126,7 @@ _dl_signal_cerror (int errcode, const char *objname, const char *occation,
(*receiver) (errcode, objname, errstring); (*receiver) (errcode, objname, errstring);
} }
else else
INT(_dl_signal_error) (errcode, objname, occation, errstring); INTUSE(_dl_signal_error) (errcode, objname, occation, errstring);
} }

2
elf/dl-fini.c
View File

@ -147,7 +147,7 @@ _dl_fini (void)
/* When debugging print a message first. */ /* When debugging print a message first. */
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_IMPCALLS, 0)) if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_IMPCALLS, 0))
INT(_dl_debug_printf) ("\ncalling fini: %s\n\n", INTUSE(_dl_debug_printf) ("\ncalling fini: %s\n\n",
l->l_name[0] ? l->l_name : _dl_argv[0]); l->l_name[0] ? l->l_name : _dl_argv[0]);
/* First see whether an array is given. */ /* First see whether an array is given. */

8
elf/dl-lookup.c
View File

@ -168,7 +168,7 @@ add_dependency (struct link_map *undef_map, struct link_map *map)
/* Display information if we are debugging. */ /* Display information if we are debugging. */
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_FILES, 0)) if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_FILES, 0))
INT(_dl_debug_printf) ("\ INTUSE(_dl_debug_printf) ("\
\nfile=%s; needed by %s (relocation dependency)\n\n", \nfile=%s; needed by %s (relocation dependency)\n\n",
map->l_name[0] ? map->l_name : _dl_argv[0], map->l_name[0] ? map->l_name : _dl_argv[0],
undef_map->l_name[0] undef_map->l_name[0]
@ -240,7 +240,7 @@ _dl_lookup_symbol (const char *undef_name, struct link_map *undef_map,
&& add_dependency (undef_map, current_value.m) < 0) && add_dependency (undef_map, current_value.m) < 0)
/* Something went wrong. Perhaps the object we tried to reference /* Something went wrong. Perhaps the object we tried to reference
was just removed. Try finding another definition. */ was just removed. Try finding another definition. */
return INT(_dl_lookup_symbol) (undef_name, undef_map, ref, return INTUSE(_dl_lookup_symbol) (undef_name, undef_map, ref,
symbol_scope, type_class, 0); symbol_scope, type_class, 0);
break; break;
@ -402,7 +402,7 @@ _dl_lookup_versioned_symbol (const char *undef_name,
&& add_dependency (undef_map, current_value.m) < 0) && add_dependency (undef_map, current_value.m) < 0)
/* Something went wrong. Perhaps the object we tried to reference /* Something went wrong. Perhaps the object we tried to reference
was just removed. Try finding another definition. */ was just removed. Try finding another definition. */
return INT(_dl_lookup_versioned_symbol) (undef_name, undef_map, return INTUSE(_dl_lookup_versioned_symbol) (undef_name, undef_map,
ref, symbol_scope, ref, symbol_scope,
version, type_class, 0); version, type_class, 0);
@ -600,7 +600,7 @@ _dl_debug_bindings (const char *undef_name, struct link_map *undef_map,
if (GL(dl_debug_mask) & DL_DEBUG_BINDINGS) if (GL(dl_debug_mask) & DL_DEBUG_BINDINGS)
{ {
INT(_dl_debug_printf) ("binding file %s to %s: %s symbol `%s'", INTUSE(_dl_debug_printf) ("binding file %s to %s: %s symbol `%s'",
(reference_name[0] (reference_name[0]
? reference_name ? reference_name
: (_dl_argv[0] ?: "<main program>")), : (_dl_argv[0] ?: "<main program>")),

8
elf/dl-runtime.c
View File

@ -87,7 +87,7 @@ fixup (
if (version->hash != 0) if (version->hash != 0)
{ {
result = INT(_dl_lookup_versioned_symbol) (strtab result = INTUSE(_dl_lookup_versioned_symbol) (strtab
+ sym->st_name, + sym->st_name,
l, &sym, l->l_scope, l, &sym, l->l_scope,
version, version,
@ -97,7 +97,7 @@ fixup (
} }
} }
case 0: case 0:
result = INT(_dl_lookup_symbol) (strtab + sym->st_name, l, &sym, result = INTUSE(_dl_lookup_symbol) (strtab + sym->st_name, l, &sym,
l->l_scope, ELF_RTYPE_CLASS_PLT, 0); l->l_scope, ELF_RTYPE_CLASS_PLT, 0);
} }
@ -181,7 +181,7 @@ profile_fixup (
if (version->hash != 0) if (version->hash != 0)
{ {
result = INT(_dl_lookup_versioned_symbol) (strtab result = INTUSE(_dl_lookup_versioned_symbol) (strtab
+ sym->st_name, + sym->st_name,
l, &sym, l, &sym,
l->l_scope, l->l_scope,
@ -192,7 +192,7 @@ profile_fixup (
} }
} }
case 0: case 0:
result = INT(_dl_lookup_symbol) (strtab + sym->st_name, l, &sym, result = INTUSE(_dl_lookup_symbol) (strtab + sym->st_name, l, &sym,
l->l_scope, ELF_RTYPE_CLASS_PLT, l->l_scope, ELF_RTYPE_CLASS_PLT,
0); 0);
} }

2
elf/do-lookup.h
View File

@ -61,7 +61,7 @@ FCT (const char *undef_name, unsigned long int hash, const ElfW(Sym) *ref,
/* Print some debugging info if wanted. */ /* Print some debugging info if wanted. */
if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_SYMBOLS, 0)) if (__builtin_expect (GL(dl_debug_mask) & DL_DEBUG_SYMBOLS, 0))
INT(_dl_debug_printf) ("symbol=%s; lookup in file=%s\n", undef_name, INTUSE(_dl_debug_printf) ("symbol=%s; lookup in file=%s\n", undef_name,
map->l_name[0] ? map->l_name : _dl_argv[0]); map->l_name[0] ? map->l_name : _dl_argv[0]);
symtab = (const void *) D_PTR (map, l_info[DT_SYMTAB]); symtab = (const void *) D_PTR (map, l_info[DT_SYMTAB]);