# HG changeset patch # User Tassilo Philipp # Date 1611255031 -3600 # Node ID c7c180c73dc99eaf9327f3a4de418c59f26cc3c6 # Parent 11483966a3ee683774f02d34e403dcf06e57f160 - haiku dynload fix diff -r 11483966a3ee -r c7c180c73dc9 dynload/dynload_unix.c --- a/dynload/dynload_unix.c Thu Jan 21 17:27:02 2021 +0100 +++ b/dynload/dynload_unix.c Thu Jan 21 19:50:31 2021 +0100 @@ -162,8 +162,9 @@ /* - OpenBSD >= 3.7 has dl_iterate_phdr(), as well as glibc >= 2.2.4 - also some libc impls (like musl) provide dlinfo(), but not RTLD_SELF (see above), however they might come with dl_iterate_phdr (which comes from ELF program header iteration), so base it on that - - skip and use dladdr()-based guessing (see below) if explicitly requested, e.g. by ./configure */ -#elif !defined(DL_DLADDR_TO_LIBPATH) && (defined(OS_OpenBSD) || defined(DL_USE_GLIBC_ITER_PHDR) || (!defined(RTLD_SELF) && defined(__ELF__))) + - skip and use dladdr()-based guessing (see below) if explicitly requested, e.g. by ./configure + - Haiku/BeOS does have the headers but no implementation of dl_iterate_phdr() (at least as of 2021) */ +#elif !defined(DL_DLADDR_TO_LIBPATH) && (defined(OS_OpenBSD) || defined(DL_USE_GLIBC_ITER_PHDR) || (!defined(RTLD_SELF) && defined(__ELF__))) && !defined(OS_BeOS) #include #include