summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2012-01-10 23:36:59 +0000
committerKostya Serebryany <kcc@google.com>2012-01-10 23:36:59 +0000
commit258d7b4182e2900679b0bf132e2bd03d487aba61 (patch)
tree7dd946df3fb4497a650eb0bab575b64ac5e5eccf
parentc260232dfa166b7d9ff43e6c11fcd5c61e1d11a4 (diff)
downloadbcm5719-llvm-258d7b4182e2900679b0bf132e2bd03d487aba61.tar.gz
bcm5719-llvm-258d7b4182e2900679b0bf132e2bd03d487aba61.zip
[asan] hopefully fix the build on MacOS 10.6 (the code did work on 10.7, where I tested it)
llvm-svn: 147896
-rw-r--r--compiler-rt/lib/asan/asan_interceptors.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/compiler-rt/lib/asan/asan_interceptors.cc b/compiler-rt/lib/asan/asan_interceptors.cc
index c445ca1316d..eca06888c6f 100644
--- a/compiler-rt/lib/asan/asan_interceptors.cc
+++ b/compiler-rt/lib/asan/asan_interceptors.cc
@@ -28,6 +28,7 @@
#include <string.h>
#include <strings.h>
+#include <pthread.h>
namespace __asan {
@@ -223,13 +224,10 @@ static void *asan_thread_start(void *arg) {
}
extern "C"
-int pthread_create(void *thread, const void *attr,
- void *(*start_routine) (void *), void *arg);
-extern "C"
#ifndef __APPLE__
__attribute__((visibility("default")))
#endif
-int WRAP(pthread_create)(void *thread, const void *attr,
+int WRAP(pthread_create)(pthread_t *thread, const pthread_attr_t *attr,
void *(*start_routine) (void *), void *arg) {
GET_STACK_TRACE_HERE(kStackTraceMax, /*fast_unwind*/false);
AsanThread *curr_thread = asanThreadRegistry().GetCurrent();
OpenPOWER on IntegriCloud