commit 560e9f65f4e2d9c170a676ebc0f78d3b76049333
author Yi Kong <yikong@google.com> Mon Jul 22 20:41:03 2019 +0000
committer Yi Kong <yikong@google.com> Mon Jul 22 20:41:03 2019 +0000
tree 3f0d9f414e6fc8fbe02ef261a16af64c20061c8e
parent 7e0aa1490c5f03156ea95480c4ffa22e531351a2

[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

git-svn-id: https://llvm.org/svn/llvm-project/libunwind/trunk@366734 91177308-0d34-0410-b5e6-96231b3b80d8

src/AddressSpace.hpp

diff --git a/src/AddressSpace.hpp b/src/AddressSpace.hpp
index fb07c80..2c9a083 100644
--- a/src/AddressSpace.hpp
+++ b/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

src/RWMutex.hpp

diff --git a/src/RWMutex.hpp b/src/RWMutex.hpp
index a37ac77..954e94c 100644
--- a/src/RWMutex.hpp
+++ b/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