Fix ia64 build after r233655.
MFC after: 1 week
This commit is contained in:
parent
03e9308f0a
commit
5b7a7b02b8
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=233674
@ -2618,7 +2618,9 @@ do_dlsym(void *handle, const char *name, void *retaddr, const Ver_Entry *ve,
|
|||||||
const Elf_Sym *def;
|
const Elf_Sym *def;
|
||||||
SymLook req;
|
SymLook req;
|
||||||
RtldLockState lockstate;
|
RtldLockState lockstate;
|
||||||
|
#ifndef __ia64__
|
||||||
tls_index ti;
|
tls_index ti;
|
||||||
|
#endif
|
||||||
int res;
|
int res;
|
||||||
|
|
||||||
def = NULL;
|
def = NULL;
|
||||||
@ -2734,9 +2736,13 @@ do_dlsym(void *handle, const char *name, void *retaddr, const Ver_Entry *ve,
|
|||||||
else if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC)
|
else if (ELF_ST_TYPE(def->st_info) == STT_GNU_IFUNC)
|
||||||
return (rtld_resolve_ifunc(defobj, def));
|
return (rtld_resolve_ifunc(defobj, def));
|
||||||
else if (ELF_ST_TYPE(def->st_info) == STT_TLS) {
|
else if (ELF_ST_TYPE(def->st_info) == STT_TLS) {
|
||||||
|
#ifdef __ia64__
|
||||||
|
return (__tls_get_addr(defobj->tlsindex, def->st_value));
|
||||||
|
#else
|
||||||
ti.ti_module = defobj->tlsindex;
|
ti.ti_module = defobj->tlsindex;
|
||||||
ti.ti_offset = def->st_value;
|
ti.ti_offset = def->st_value;
|
||||||
return (__tls_get_addr(&ti));
|
return (__tls_get_addr(&ti));
|
||||||
|
#endif
|
||||||
} else
|
} else
|
||||||
return (defobj->relocbase + def->st_value);
|
return (defobj->relocbase + def->st_value);
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user