AuroraMiddleware/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2024-11-10 15:20:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update.

Browse Source 
non-hidden over hidden symbols and strong over weak symbols
	if both don't start with '_'.
This commit is contained in:
Ulrich Drepper 2004-08-13 18:52:51 +00:00
parent eba19d2be7
commit b8b9340e6f
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,7 +1,8 @@
2004-08-13 Ulrich Drepper <drepper@redhat.com> 2004-08-13 Ulrich Drepper <drepper@redhat.com>
* elf/sprof.c (read_symbols): When comparing aliases, prefer * elf/sprof.c (read_symbols): When comparing aliases, prefer
strong over weak symbols if both don't start with '_'. non-hidden over hidden symbols and strong over weak symbols
if both don't start with '_'.
* malloc/malloc.c: Use strong_alias instead of weak_alias wherever * malloc/malloc.c: Use strong_alias instead of weak_alias wherever
possible. possible.

18
elf/sprof.c
View File

@ -28,6 +28,7 @@
#include <locale.h> #include <locale.h>
#include <obstack.h> #include <obstack.h>
#include <search.h> #include <search.h>
#include <stdbool.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -148,7 +149,8 @@ struct known_symbol
const char *name; const char *name;
uintptr_t addr; uintptr_t addr;
size_t size; size_t size;
int weak; bool weak;
bool hidden;
uintmax_t ticks; uintmax_t ticks;
uintmax_t calls; uintmax_t calls;
@ -940,6 +942,8 @@ read_symbols (struct shobj *shobj)
newsym->addr = sym->st_value; newsym->addr = sym->st_value;
newsym->size = sym->st_size; newsym->size = sym->st_size;
newsym->weak = ELFW(ST_BIND) (sym->st_info) == STB_WEAK; newsym->weak = ELFW(ST_BIND) (sym->st_info) == STB_WEAK;
newsym->hidden = (ELFW(ST_VISIBILITY) (sym->st_other)
!= STV_DEFAULT);
newsym->ticks = 0; newsym->ticks = 0;
newsym->calls = 0; newsym->calls = 0;
@ -954,9 +958,10 @@ read_symbols (struct shobj *shobj)
{ {
/* The function is already defined. See whether we have /* The function is already defined. See whether we have
a better name here. */ a better name here. */
if (((*existp)->name[0] == '_' && newsym->name[0] != '_') if (((*existp)->hidden && !newsym->hidden)
|| ((*existp)->name[0] == '_' && newsym->name[0] != '_')
|| ((*existp)->name[0] != '_' && newsym->name[0] != '_' || ((*existp)->name[0] != '_' && newsym->name[0] != '_'
&& (*existp)->weak && !newsym->weak)) && ((*existp)->weak && !newsym->weak)))
*existp = newsym; *existp = newsym;
else else
/* We don't need the allocated memory. */ /* We don't need the allocated memory. */
@ -995,6 +1000,8 @@ read_symbols (struct shobj *shobj)
newsym->addr = symtab->st_value; newsym->addr = symtab->st_value;
newsym->size = symtab->st_size; newsym->size = symtab->st_size;
newsym->weak = ELFW(ST_BIND) (symtab->st_info) == STB_WEAK; newsym->weak = ELFW(ST_BIND) (symtab->st_info) == STB_WEAK;
newsym->hidden = (ELFW(ST_VISIBILITY) (symtab->st_other)
!= STV_DEFAULT);
newsym->ticks = 0; newsym->ticks = 0;
newsym->froms = NULL; newsym->froms = NULL;
newsym->tos = NULL; newsym->tos = NULL;
@ -1010,9 +1017,10 @@ read_symbols (struct shobj *shobj)
{ {
/* The function is already defined. See whether we have /* The function is already defined. See whether we have
a better name here. */ a better name here. */
if (((*existp)->name[0] == '_' && newsym->name[0] != '_') if (((*existp)->hidden && !newsym->hidden)
|| ((*existp)->name[0] == '_' && newsym->name[0] != '_')
|| ((*existp)->name[0] != '_' && newsym->name[0] != '_' || ((*existp)->name[0] != '_' && newsym->name[0] != '_'
&& (*existp)->weak && !newsym->weak)) && ((*existp)->weak && !newsym->weak)))
*existp = newsym; *existp = newsym;
else else
/* We don't need the allocated memory. */ /* We don't need the allocated memory. */