[PATCH] ntdll: fix backward compatibility for struct link_map on FreeBSD
Damjan Jovanovic
damjan.jov at gmail.com
Mon Nov 30 12:08:01 CST 2020
Checking for the _rtld_version_laddr_offset symbol only works when
header and library versions match. Checking for the offset of l_addr
instead lets us use the older header with the new library too.
Signed-off-by: Damjan Jovanovic <damjan.jov at gmail.com>
---
dlls/ntdll/unix/loader.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-------------- next part --------------
diff --git a/dlls/ntdll/unix/loader.c b/dlls/ntdll/unix/loader.c
index 61c8f5e18f5..f17b319b9ac 100644
--- a/dlls/ntdll/unix/loader.c
+++ b/dlls/ntdll/unix/loader.c
@@ -1417,7 +1417,7 @@ found:
#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 (offsetof(struct link_map, l_addr) == 0)
if (!get_relocbase(map->l_addr, &relocbase)) return;
#endif
switch (dyn->d_tag)
More information about the wine-devel
mailing list