[compiler-rt] r200386 - [asan] fix build on Mac (hopefully)

Kostya Serebryany kcc at google.com
Wed Jan 29 02:26:38 PST 2014


Author: kcc
Date: Wed Jan 29 04:26:38 2014
New Revision: 200386

URL: http://llvm.org/viewvc/llvm-project?rev=200386&view=rev
Log:
[asan] fix build on Mac (hopefully)

Modified:
    compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc

Modified: compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc?rev=200386&r1=200385&r2=200386&view=diff
==============================================================================
--- compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc (original)
+++ compiler-rt/trunk/lib/sanitizer_common/sanitizer_common_interceptors.inc Wed Jan 29 04:26:38 2014
@@ -3064,6 +3064,12 @@ INTERCEPTOR(__sanitizer_clock_t, times,
   return res;
 }
 #define INIT_TIMES COMMON_INTERCEPT_FUNCTION(times);
+#else
+#define INIT_TIMES
+#endif
+
+#if SANITIZER_INTERCEPT_TLS_GET_ADDR
+#define INIT_TLS_GET_ADDR COMMON_INTERCEPT_FUNCTION(__tls_get_addr)
 INTERCEPTOR(void *, __tls_get_addr, void *arg) {
   void *ctx;
   COMMON_INTERCEPTOR_ENTER(ctx, __tls_get_addr, arg);
@@ -3072,12 +3078,6 @@ INTERCEPTOR(void *, __tls_get_addr, void
   return res;
 }
 #else
-#define INIT_TIMES
-#endif
-
-#if SANITIZER_INTERCEPT_TLS_GET_ADDR
-#define INIT_TLS_GET_ADDR COMMON_INTERCEPT_FUNCTION(__tls_get_addr)
-#else
 #define INIT_TLS_GET_ADDR
 #endif
 





More information about the llvm-commits mailing list