ntdll: Interpretation of l_addr depends on FreeBSD version.
FreeBSD changed l_addr to mean the relocation offset like it does on other OSes, and provided a dynamic linker symbol, "_rtld_version_laddr_offset", that can be used to check the meaning. Signed-off-by: Damjan Jovanovic <damjan.jov@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
fed3784ab0
commit
f728a5f3f9
|
@ -1372,8 +1372,10 @@ static void call_constructors( WINE_MODREF *wm )
|
||||||
{
|
{
|
||||||
caddr_t relocbase = (caddr_t)map->l_addr;
|
caddr_t relocbase = (caddr_t)map->l_addr;
|
||||||
|
|
||||||
#ifdef __FreeBSD__ /* FreeBSD doesn't relocate l_addr */
|
#ifdef __FreeBSD__
|
||||||
if (!get_relocbase(map->l_addr, &relocbase)) return;
|
/* On older FreeBSD versions, l_addr was the absolute load address, now it's the relocation offset. */
|
||||||
|
if (!dlsym(RTLD_DEFAULT, "_rtld_version_laddr_offset"))
|
||||||
|
if (!get_relocbase(map->l_addr, &relocbase)) return;
|
||||||
#endif
|
#endif
|
||||||
switch (dyn->d_tag)
|
switch (dyn->d_tag)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue