Skip to content

Commit d8bdb92

Browse files
kongykongy
committed
[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
1 parent 4de5d9d commit d8bdb92

16 files changed

+16
-16
lines changed

‎libcxx/src/algorithm.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "random"
1111
#ifndef _LIBCPP_HAS_NO_THREADS
1212
#include "mutex"
13-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
13+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
1414
#pragma comment(lib, "pthread")
1515
#endif
1616
#endif

‎libcxx/src/chrono.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
#endif
3838
#endif
3939

40-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
40+
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
4141
#pragma comment(lib, "rt")
4242
#endif
4343

‎libcxx/src/condition_variable.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "system_error"
1616
#include "__undef_macros"
1717

18-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
18+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
1919
#pragma comment(lib, "pthread")
2020
#endif
2121

‎libcxx/src/debug.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#include "__hash_table"
1616
#ifndef _LIBCPP_HAS_NO_THREADS
1717
#include "mutex"
18-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
18+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
1919
#pragma comment(lib, "pthread")
2020
#endif
2121
#endif

‎libcxx/src/experimental/memory_resource.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include "atomic"
1313
#elif !defined(_LIBCPP_HAS_NO_THREADS)
1414
#include "mutex"
15-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
15+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
1616
#pragma comment(lib, "pthread")
1717
#endif
1818
#endif

‎libcxx/src/filesystem/operations.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
#include <sys/time.h> // for gettimeofday and timeval
4545
#endif // !defined(CLOCK_REALTIME)
4646

47-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
47+
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
4848
#pragma comment(lib, "rt")
4949
#endif
5050

‎libcxx/src/memory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#ifndef _LIBCPP_HAS_NO_THREADS
1111
#include "mutex"
1212
#include "thread"
13-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
13+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
1414
#pragma comment(lib, "pthread")
1515
#endif
1616
#endif

‎libcxx/src/mutex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#include "__undef_macros"
1414

1515
#ifndef _LIBCPP_HAS_NO_THREADS
16-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
16+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
1717
#pragma comment(lib, "pthread")
1818
#endif
1919
#endif

‎libcxx/src/shared_mutex.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#ifndef _LIBCPP_HAS_NO_THREADS
1111

1212
#include "shared_mutex"
13-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
13+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
1414
#pragma comment(lib, "pthread")
1515
#endif
1616

‎libcxx/src/thread.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include <windows.h>
3636
#endif
3737

38-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
38+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCPP_HAS_COMMENT_LIB_PRAGMA)
3939
#pragma comment(lib, "pthread")
4040
#endif
4141

‎libcxxabi/src/cxa_exception_storage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ extern "C" {
4646
#include "abort_message.h"
4747
#include "fallback_malloc.h"
4848

49-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCXXABI_HAS_COMMENT_LIB_PRAGMA)
49+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCXXABI_HAS_COMMENT_LIB_PRAGMA)
5050
#pragma comment(lib, "pthread")
5151
#endif
5252

‎libcxxabi/src/cxa_guard_impl.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
#include <stdlib.h>
5151
#include <__threading_support>
5252
#ifndef _LIBCXXABI_HAS_NO_THREADS
53-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCXXABI_HAS_COMMENT_LIB_PRAGMA)
53+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCXXABI_HAS_COMMENT_LIB_PRAGMA)
5454
#pragma comment(lib, "pthread")
5555
#endif
5656
#endif

‎libcxxabi/src/cxa_thread_atexit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "cxxabi.h"
1111
#include <__threading_support>
1212
#ifndef _LIBCXXABI_HAS_NO_THREADS
13-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCXXABI_HAS_COMMENT_LIB_PRAGMA)
13+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCXXABI_HAS_COMMENT_LIB_PRAGMA)
1414
#pragma comment(lib, "pthread")
1515
#endif
1616
#endif

‎libcxxabi/src/fallback_malloc.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
#include <__threading_support>
1515
#ifndef _LIBCXXABI_HAS_NO_THREADS
16-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBCXXABI_HAS_COMMENT_LIB_PRAGMA)
16+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBCXXABI_HAS_COMMENT_LIB_PRAGMA)
1717
#pragma comment(lib, "pthread")
1818
#endif
1919
#endif

‎libunwind/src/AddressSpace.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727

2828
#if _LIBUNWIND_USE_DLADDR
2929
#include <dlfcn.h>
30-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBUNWIND_HAS_COMMENT_LIB_PRAGMA)
30+
#if defined(__unix__) && defined(__ELF__) && defined(_LIBUNWIND_HAS_COMMENT_LIB_PRAGMA)
3131
#pragma comment(lib, "dl")
3232
#endif
3333
#endif

‎libunwind/src/RWMutex.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include <windows.h>
1818
#elif !defined(_LIBUNWIND_HAS_NO_THREADS)
1919
#include <pthread.h>
20-
#if defined(__unix__) && defined(__ELF__) && defined(_LIBUNWIND_HAS_COMMENT_LIB_PRAGMA)
20+
#if defined(__unix__) && !defined(__ANDROID__) && defined(__ELF__) && defined(_LIBUNWIND_HAS_COMMENT_LIB_PRAGMA)
2121
#pragma comment(lib, "pthread")
2222
#endif
2323
#endif

0 commit comments

Comments
 (0)