summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKostya Serebryany <kcc@google.com>2014-01-29 10:26:38 +0000
committerKostya Serebryany <kcc@google.com>2014-01-29 10:26:38 +0000
commitcda06acd313a4204f82f21bf3eed74ef3772acb8 (patch)
treec2574e865241dfdf40c59fa73d05e8cebe5da360
parente72a6f7a70879e6b9e35f30823c51a08244c0e18 (diff)
downloadbcm5719-llvm-cda06acd313a4204f82f21bf3eed74ef3772acb8.tar.gz
bcm5719-llvm-cda06acd313a4204f82f21bf3eed74ef3772acb8.zip
[asan] fix build on Mac (hopefully)
llvm-svn: 200386
-rw-r--r--compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
index 12594caafcd..abf5b24cf78 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors.inc
@@ -3064,6 +3064,12 @@ INTERCEPTOR(__sanitizer_clock_t, times, void *tms) {
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 *arg) {
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
OpenPOWER on IntegriCloud