From e3813d6d8526e5e3f8bfe5a9a780570befb27d5a Mon Sep 17 00:00:00 2001
From: miod <>
Date: Mon, 18 Oct 2010 18:06:09 +0000
Subject: Disable use of dladdr() on a.out arches, they do not provide it
 (yet); ok djm@

---
 src/lib/libcrypto/dso/dso_dlfcn.c         | 2 +-
 src/lib/libssl/src/crypto/dso/dso_dlfcn.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/libcrypto/dso/dso_dlfcn.c b/src/lib/libcrypto/dso/dso_dlfcn.c
index 5dceaf7b00..578a20d91d 100644
--- a/src/lib/libcrypto/dso/dso_dlfcn.c
+++ b/src/lib/libcrypto/dso/dso_dlfcn.c
@@ -85,7 +85,7 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
 # define HAVE_DLINFO 1
 # if defined(_AIX) || defined(__CYGWIN__) || \
      defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
-     (defined(__OpenBSD__) && !defined(RTLD_SELF))
+     (defined(__OpenBSD__) && (!defined(__ELF__) || !defined(RTLD_SELF)))
 #  undef HAVE_DLINFO
 # endif
 #endif
diff --git a/src/lib/libssl/src/crypto/dso/dso_dlfcn.c b/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
index 5dceaf7b00..578a20d91d 100644
--- a/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
+++ b/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
@@ -85,7 +85,7 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
 # define HAVE_DLINFO 1
 # if defined(_AIX) || defined(__CYGWIN__) || \
      defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
-     (defined(__OpenBSD__) && !defined(RTLD_SELF))
+     (defined(__OpenBSD__) && (!defined(__ELF__) || !defined(RTLD_SELF)))
 #  undef HAVE_DLINFO
 # endif
 #endif
-- 
cgit v1.2.3-55-g6feb