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>

ntdll: Interpretation of l_addr depends on FreeBSD version.
f728a5f3 · Damjan Jovanovic · Alexandre Julliard · fed3784a · f728a5f3
Commit f728a5f3 authored Jun 10, 2020 by Damjan Jovanovic Committed by Alexandre Julliard Jun 10, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

loader.c dlls/ntdll/loader.c +4 -2

No files found.
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -1372,8 +1372,10 @@ static void call_constructors( WINE_MODREF *wm )
    {
        caddr_t relocbase = (caddr_t)map->l_addr;

-#ifdef __FreeBSD__  /* FreeBSD doesn't relocate l_addr */
-        if (!get_relocbase(map->l_addr, &relocbase)) return;
+#ifdef __FreeBSD__
+        /* 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
        switch (dyn->d_tag)
        {