jyapayne/musl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix symbol acceptance/rejection rules for TLS

Browse source 
symbol value of 0 is not "undefined" for TLS; it's the address of the
first symbol in the TLS segment. however, non-definition TLS
references also have values of 0, so check the section.

hopefully the new logic is more clear, too.
This commit is contained in:
Rich Felker 2012-10-06 01:36:11 -04:00
commit bd17431a2c
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/ldso/dynlink.c
View file

@ -209,14 +209,20 @@ static struct symdef find_sym(struct dso *dso, const char *s, int need_def)
if (!h) h = sysv_hash(s); if (!h) h = sysv_hash(s);
sym = sysv_lookup(s, h, dso); sym = sysv_lookup(s, h, dso);
} }
if (sym && (!need_def || sym->st_shndx) && sym->st_value if (!sym) continue;
&& (1<<(sym->st_info&0xf) & OK_TYPES) if (!sym->st_shndx)
&& (1<<(sym->st_info>>4) & OK_BINDS)) { if (need_def || (sym->st_info&0xf) == STT_TLS)
if (def.sym && sym->st_info>>4 == STB_WEAK) continue; continue;
def.sym = sym; if (!sym->st_value)
def.dso = dso; if ((sym->st_info&0xf) != STT_TLS)
if (sym->st_info>>4 == STB_GLOBAL) break; continue;
} if (!(1<<(sym->st_info&0xf) & OK_TYPES)) continue;
if (!(1<<(sym->st_info>>4) & OK_BINDS)) continue;
if (def.sym && sym->st_info>>4 == STB_WEAK) continue;
def.sym = sym;
def.dso = dso;
if (sym->st_info>>4 == STB_GLOBAL) break;
} }
return def; return def;
} }