d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

If a symbol has section+offset definitions provided, always use instead

Browse Source 
of doing a name lookup for global symbols.  This fixes the snd_pcm module.
This commit is contained in:
Peter Wemm 2004-05-18 05:15:43 +00:00
parent 82d0d1a01b
commit 4cec6f5d02
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/kern/link_elf_obj.c
View File

@ -868,12 +868,8 @@ elf_obj_lookup(linker_file_t lf, Elf_Word symidx, int deps)
sym = ef->ddbsymtab + symidx;
/* Theoretically we can avoid a lookup for some locals */
switch (ELF_ST_BIND(sym->st_info)) {
case STB_LOCAL:
/* Local, but undefined? huh? */
if (sym->st_shndx == SHN_UNDEF)
return (0);
/* Quick answer if there is a definition included. */
if (sym->st_shndx != SHN_UNDEF) {
ret = 0;
/* Relative to section number */
for (i = 0; i < ef->nprogtab; i++) {
@ -883,6 +879,13 @@ elf_obj_lookup(linker_file_t lf, Elf_Word symidx, int deps)
}
}
return ret + sym->st_value;
}
/* If we get here, then it is undefined and needs a lookup. */
switch (ELF_ST_BIND(sym->st_info)) {
case STB_LOCAL:
/* Local, but undefined? huh? */
return (0);
case STB_GLOBAL:
/* Relative to Data or Function name */