<div class="gmail_quote">Reverted this in r150699, sorry.</div><div class="gmail_quote"><br></div><div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
I'm see this when trying to build:<br>
<br>
/Users/buildslave/zorg/buildbot/smooshlab/slave-0.8/build.clang-x86_64-darwin10-gcc42-RA/llvm/projects/compiler-rt/lib/asan/asan_interceptors.cc:222:5: error: conflicting types for 'pthread_create'<br>
int pthread_create(void *thread, const void *attr,<br>
    ^<br>
/usr/include/pthread.h:298:11: note: previous declaration is here<br>
int       pthread_create(pthread_t * __restrict,<br>
          ^<br>
<br>
<br>
<br>
On 16 Feb 2012, at 3:26 AM, Alexey Samsonov wrote:<br>
<br>
> Author: samsonov<br>
> Date: Thu Feb 16 05:26:52 2012<br>
> New Revision: 150683<br>
><br>
> URL: <a href="http://llvm.org/viewvc/llvm-project?rev=150683&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=150683&view=rev</a><br>
> Log:<br>
> AddressSanitizer: don't include pthread.h and signal.h in interceptors on Mac<br>
><br>
> Modified:<br>
>    compiler-rt/trunk/lib/asan/asan_interceptors.cc<br>
>    compiler-rt/trunk/lib/asan/asan_interceptors.h<br>
><br>
> Modified: compiler-rt/trunk/lib/asan/asan_interceptors.cc<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interceptors.cc?rev=150683&r1=150682&r2=150683&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interceptors.cc?rev=150683&r1=150682&r2=150683&view=diff</a><br>

> ==============================================================================<br>
> --- compiler-rt/trunk/lib/asan/asan_interceptors.cc (original)<br>
> +++ compiler-rt/trunk/lib/asan/asan_interceptors.cc Thu Feb 16 05:26:52 2012<br>
> @@ -34,11 +34,11 @@<br>
><br>
> #if defined(__APPLE__)<br>
> // FIXME(samsonov): Gradually replace system headers with declarations of<br>
> -// intercepted functions.<br>
> -#include <pthread.h><br>
> -#include <signal.h><br>
> +// intercepted functions. We need these declarations on Mac to get addresses of<br>
> +// the functions to intercept.<br>
> #include <string.h><br>
> #include <strings.h><br>
> +<br>
> #endif  // __APPLE__<br>
><br>
> namespace __asan {<br>
> @@ -218,8 +218,10 @@<br>
> }<br>
><br>
> #ifndef _WIN32<br>
> -INTERCEPTOR(int, pthread_create, pthread_t *thread,<br>
> -                                 const pthread_attr_t *attr,<br>
> +extern "C"<br>
> +int pthread_create(void *thread, const void *attr,<br>
> +                   void *(*start_routine)(void*), void *arg);<br>
> +INTERCEPTOR(int, pthread_create, void *thread, const void *attr,<br>
>                                  void *(*start_routine)(void*), void *arg) {<br>
>   GET_STACK_TRACE_HERE(kStackTraceMax);<br>
>   int current_tid = asanThreadRegistry().GetCurrentTidOrMinusOne();<br>
> @@ -237,8 +239,9 @@<br>
>   return NULL;<br>
> }<br>
><br>
> -INTERCEPTOR(int, sigaction, int signum, const struct sigaction *act,<br>
> -                            struct sigaction *oldact) {<br>
> +extern "C"<br>
> +int sigaction(int signum, const void *act, void *oldact);<br>
> +INTERCEPTOR(int, sigaction, int signum, const void *act, void *oldact) {<br>
>   if (!AsanInterceptsSignal(signum)) {<br>
>     return REAL(sigaction)(signum, act, oldact);<br>
>   }<br>
> @@ -393,8 +396,7 @@<br>
> #endif<br>
><br>
> #ifdef ANDROID<br>
> -DEFINE_REAL(int, sigaction, int signum, const struct sigaction *act,<br>
> -    struct sigaction *oldact);<br>
> +DEFINE_REAL(int, sigaction, int signum, const void *act, void *oldact);<br>
> #endif<br>
><br>
> INTERCEPTOR(int, strcasecmp, const char *s1, const char *s2) {<br>
><br>
> Modified: compiler-rt/trunk/lib/asan/asan_interceptors.h<br>
> URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interceptors.h?rev=150683&r1=150682&r2=150683&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interceptors.h?rev=150683&r1=150682&r2=150683&view=diff</a><br>

> ==============================================================================<br>
> --- compiler-rt/trunk/lib/asan/asan_interceptors.h (original)<br>
> +++ compiler-rt/trunk/lib/asan/asan_interceptors.h Thu Feb 16 05:26:52 2012<br>
> @@ -24,9 +24,7 @@<br>
> DECLARE_REAL(size_t, strlen, const char *s);<br>
> DECLARE_REAL(char*, strncpy, char *to, const char *from, size_t size);<br>
> DECLARE_REAL(size_t, strnlen, const char *s, size_t maxlen);<br>
> -struct sigaction;<br>
> -DECLARE_REAL(int, sigaction, int signum, const struct sigaction *act,<br>
> -                             struct sigaction *oldact);<br>
> +DECLARE_REAL(int, sigaction, int signum, const void *act, void *oldact);<br>
><br>
> namespace __asan {<br>
><br>
><br>
><br>
> _______________________________________________<br>
> llvm-commits mailing list<br>
> <a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
> <a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
<span class="HOEnZb"><font color="#888888"><br>
-David<br>
<br>
<br>
</font></span></blockquote></div><br><br clear="all"><div><br></div>-- <br><div>Alexey Samsonov</div><div>Software Engineer, Moscow</div><div><a href="mailto:samsonov@google.com" target="_blank">samsonov@google.com</a></div>
<br>