summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormiod <>2012-10-22 17:11:37 +0000
committermiod <>2012-10-22 17:11:37 +0000
commite20093d61c475a4cd15e9e663f32b4d0f86f7fc7 (patch)
treef6d21650d0316bc3afccd4ece3e21ee57437902e
parent3ad9227df9edaac3e94f314891deeb4d52d16b4a (diff)
downloadopenbsd-e20093d61c475a4cd15e9e663f32b4d0f86f7fc7.tar.gz
openbsd-e20093d61c475a4cd15e9e663f32b4d0f86f7fc7.tar.bz2
openbsd-e20093d61c475a4cd15e9e663f32b4d0f86f7fc7.zip
Restore r1.10, lost during last update:
Disable use of dladdr() on a.out arches, they do not provide it (yet);
-rw-r--r--src/lib/libcrypto/dso/dso_dlfcn.c2
-rw-r--r--src/lib/libssl/src/crypto/dso/dso_dlfcn.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/dso/dso_dlfcn.c b/src/lib/libcrypto/dso/dso_dlfcn.c
index 5f351b318d..e21b9f6dbc 100644
--- a/src/lib/libcrypto/dso/dso_dlfcn.c
+++ b/src/lib/libcrypto/dso/dso_dlfcn.c
@@ -86,7 +86,7 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
86# if defined(_AIX) || defined(__CYGWIN__) || \ 86# if defined(_AIX) || defined(__CYGWIN__) || \
87 defined(__SCO_VERSION__) || defined(_SCO_ELF) || \ 87 defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
88 (defined(__osf__) && !defined(RTLD_NEXT)) || \ 88 (defined(__osf__) && !defined(RTLD_NEXT)) || \
89 (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \ 89 (defined(__OpenBSD__) && (!defined(__ELF__) || !defined(RTLD_SELF))) || \
90 defined(__ANDROID__) 90 defined(__ANDROID__)
91# undef HAVE_DLINFO 91# undef HAVE_DLINFO
92# endif 92# endif
diff --git a/src/lib/libssl/src/crypto/dso/dso_dlfcn.c b/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
index 5f351b318d..e21b9f6dbc 100644
--- a/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
+++ b/src/lib/libssl/src/crypto/dso/dso_dlfcn.c
@@ -86,7 +86,7 @@ DSO_METHOD *DSO_METHOD_dlfcn(void)
86# if defined(_AIX) || defined(__CYGWIN__) || \ 86# if defined(_AIX) || defined(__CYGWIN__) || \
87 defined(__SCO_VERSION__) || defined(_SCO_ELF) || \ 87 defined(__SCO_VERSION__) || defined(_SCO_ELF) || \
88 (defined(__osf__) && !defined(RTLD_NEXT)) || \ 88 (defined(__osf__) && !defined(RTLD_NEXT)) || \
89 (defined(__OpenBSD__) && !defined(RTLD_SELF)) || \ 89 (defined(__OpenBSD__) && (!defined(__ELF__) || !defined(RTLD_SELF))) || \
90 defined(__ANDROID__) 90 defined(__ANDROID__)
91# undef HAVE_DLINFO 91# undef HAVE_DLINFO
92# endif 92# endif