diff options
| author | Yi Kong <yikong@google.com> | 2019-07-22 20:41:03 +0000 |
|---|---|---|
| committer | Yi Kong <yikong@google.com> | 2019-07-22 20:41:03 +0000 |
| commit | d8bdb9225ce3896797892293053efac8ad8d52fb (patch) | |
| tree | 57204c23990a57ccf961afb42d3e58de8ba9f6d0 /libunwind | |
| parent | 4de5d9d61213d2b69557cb969862412d743114f7 (diff) | |
| download | bcm5719-llvm-d8bdb9225ce3896797892293053efac8ad8d52fb.tar.gz bcm5719-llvm-d8bdb9225ce3896797892293053efac8ad8d52fb.zip | |
[runtimes] Don't depend on libpthread on Android
r362048 added support for ELF dependent libraries, but broke Android
build since Android does not have libpthread. Remove the dependency on
the Android build.
Differential Revision: https://reviews.llvm.org/D65098
llvm-svn: 366734
Diffstat (limited to 'libunwind')
| -rw-r--r-- | libunwind/src/AddressSpace.hpp | 2 | ||||
| -rw-r--r-- | libunwind/src/RWMutex.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libunwind/src/AddressSpace.hpp b/libunwind/src/AddressSpace.hpp index fb07c807db9..2c9a083be2a 100644 --- a/libunwind/src/AddressSpace.hpp +++ b/libunwind/src/AddressSpace.hpp @@ -27,7 +27,7 @@ #if _LIBUNWIND_USE_DLADDR #include <dlfcn.h> -#if defined(__unix__) && defined(__ELF__) && defined(_LIBUNWIND_HAS_COMMENT_LIB_PRAGMA) +#if defined(__unix__) && defined(__ELF__) && defined(_LIBUNWIND_HAS_COMMENT_LIB_PRAGMA) #pragma comment(lib, "dl") #endif #endif diff --git a/libunwind/src/RWMutex.hpp b/libunwind/src/RWMutex.hpp index a37ac77144f..954e94c322d 100644 --- a/libunwind/src/RWMutex.hpp +++ b/libunwind/src/RWMutex.hpp @@ -17,7 +17,7 @@ #include <windows.h> #elif !defined(_LIBUNWIND_HAS_NO_THREADS) #include <pthread.h> -#if defined(__unix__) && defined(__ELF__) && defined(_LIBUNWIND_HAS_COMMENT_LIB_PRAGMA) +#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBUNWIND_HAS_COMMENT_LIB_PRAGMA) #pragma comment(lib, "pthread") #endif #endif |
