<div style="font-family: arial, helvetica, sans-serif; font-size: 10pt">Thanks! (and sorry for the breakage) <br><br><div class="gmail_quote">On Fri, Dec 7, 2012 at 9:54 PM, Alexey Samsonov <span dir="ltr"><<a href="mailto:samsonov@google.com" target="_blank">samsonov@google.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: samsonov<br>
Date: Fri Dec  7 11:54:38 2012<br>
New Revision: 169616<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=169616&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=169616&view=rev</a><br>
Log:<br>
ASan: intercept prctl on Linux only<br>
<br>
Modified:<br>
    compiler-rt/trunk/lib/asan/asan_intercepted_functions.h<br>
    compiler-rt/trunk/lib/asan/asan_interceptors.cc<br>
<br>
Modified: compiler-rt/trunk/lib/asan/asan_intercepted_functions.h<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_intercepted_functions.h?rev=169616&r1=169615&r2=169616&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_intercepted_functions.h?rev=169616&r1=169615&r2=169616&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_intercepted_functions.h (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_intercepted_functions.h Fri Dec  7 11:54:38 2012<br>
@@ -41,8 +41,10 @@<br>
<br>
 #if defined(__linux__)<br>
 # define ASAN_USE_ALIAS_ATTRIBUTE_FOR_INDEX 1<br>
+# define ASAN_INTERCEPT_PRCTL 1<br>
 #else<br>
 # define ASAN_USE_ALIAS_ATTRIBUTE_FOR_INDEX 0<br>
+# define ASAN_INTERCEPT_PRCTL 0<br>
 #endif<br>
<br>
 #if !defined(__APPLE__)<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=169616&r1=169615&r2=169616&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interceptors.cc?rev=169616&r1=169615&r2=169616&view=diff</a><br>

==============================================================================<br>
--- compiler-rt/trunk/lib/asan/asan_interceptors.cc (original)<br>
+++ compiler-rt/trunk/lib/asan/asan_interceptors.cc Fri Dec  7 11:54:38 2012<br>
@@ -177,10 +177,11 @@<br>
 }<br>
 #endif<br>
<br>
+#if ASAN_INTERCEPT_PRCTL<br>
 #define PR_SET_NAME 15<br>
-<br>
-INTERCEPTOR(int, prctl, int option, unsigned long arg2, unsigned long arg3,<br>
-            unsigned long arg4, unsigned long arg5) {<br>
+INTERCEPTOR(int, prctl, int option,<br>
+            unsigned long arg2, unsigned long arg3,  // NOLINT<br>
+            unsigned long arg4, unsigned long arg5) {  // NOLINT<br>
   int res = REAL(prctl(option, arg2, arg3, arg4, arg5));<br>
   if (option == PR_SET_NAME) {<br>
     AsanThread *t = asanThreadRegistry().GetCurrent();<br>
@@ -193,6 +194,7 @@<br>
   }<br>
   return res;<br>
 }<br>
+#endif<br>
<br>
 #if ASAN_INTERCEPT___CXA_THROW<br>
 INTERCEPTOR(void, __cxa_throw, void *a, void *b, void *c) {<br>
@@ -737,7 +739,9 @@<br>
 #if ASAN_INTERCEPT_SIGLONGJMP<br>
   ASAN_INTERCEPT_FUNC(siglongjmp);<br>
 #endif<br>
+#if ASAN_INTERCEPT_PRCTL<br>
   ASAN_INTERCEPT_FUNC(prctl);<br>
+#endif<br>
<br>
   // Intercept exception handling functions.<br>
 #if ASAN_INTERCEPT___CXA_THROW<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>
</blockquote></div><br></div>