diff options
| author | Pavel Labath <labath@google.com> | 2016-11-30 15:34:29 +0000 |
|---|---|---|
| committer | Pavel Labath <labath@google.com> | 2016-11-30 15:34:29 +0000 |
| commit | 5d92bc5bd91021cd591876983b7cbfc50be85cc0 (patch) | |
| tree | ecca1d52e76813bf99f27b65e2eeefa70bec8aee /llvm/lib/Support | |
| parent | 6f52fe9c8b063173b20e3cf23ca012c5f1ec0bc6 (diff) | |
| download | bcm5719-llvm-5d92bc5bd91021cd591876983b7cbfc50be85cc0.tar.gz bcm5719-llvm-5d92bc5bd91021cd591876983b7cbfc50be85cc0.zip | |
[Support] Use HAVE_DLOPEN to guard dlopen(3) usage
Summary:
The usage was previously guarded by HAVE_DLFCN. This breaks on Android with
LLVM_BUILD_STATIC as the platform does not provide a static version of libdl.
Using HAVE_DLOPEN fixes it as the code will only get used if we are actually able
to link an executable using dlopen.
Reviewers: rafael, beanz
Subscribers: tberghammer, danalbert, llvm-commits
Differential Revision: https://reviews.llvm.org/D26504
llvm-svn: 288246
Diffstat (limited to 'llvm/lib/Support')
| -rw-r--r-- | llvm/lib/Support/DynamicLibrary.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Support/DynamicLibrary.cpp b/llvm/lib/Support/DynamicLibrary.cpp index 9a7aeb50a21..ced21e46afe 100644 --- a/llvm/lib/Support/DynamicLibrary.cpp +++ b/llvm/lib/Support/DynamicLibrary.cpp @@ -41,7 +41,7 @@ char llvm::sys::DynamicLibrary::Invalid = 0; #else -#if HAVE_DLFCN_H +#if defined(HAVE_DLFCN_H) && defined(HAVE_DLOPEN) #include <dlfcn.h> using namespace llvm; using namespace llvm::sys; @@ -119,7 +119,7 @@ void* DynamicLibrary::SearchForAddressOfSymbol(const char *symbolName) { return i->second; } -#if HAVE_DLFCN_H +#if defined(HAVE_DLFCN_H) && defined(HAVE_DLOPEN) // Now search the libraries. if (OpenedHandles) { for (DenseSet<void *>::iterator I = OpenedHandles->begin(), |
