From c98cddd024dfd90b8cf7e7ffa9be8f588116c969 Mon Sep 17 00:00:00 2001 From: Kostya Serebryany Date: Wed, 27 Feb 2013 08:28:24 +0000 Subject: [PATCH] [asan] guard ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS definition with an #ifndef llvm-svn: 176175 --- .../lib/sanitizer_common/tests/sanitizer_test_utils.h | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/tests/sanitizer_test_utils.h b/compiler-rt/lib/sanitizer_common/tests/sanitizer_test_utils.h index 4f8bed9..a770d0f 100644 --- a/compiler-rt/lib/sanitizer_common/tests/sanitizer_test_utils.h +++ b/compiler-rt/lib/sanitizer_common/tests/sanitizer_test_utils.h @@ -36,12 +36,14 @@ typedef __int64 int64_t; #define __has_feature(x) 0 #endif -#if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__) -# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS \ +#ifndef ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS +# if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__) +# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS \ __attribute__((no_sanitize_address)) -#else -# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS -#endif +# else +# define ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS +# endif +#endif // ATTRIBUTE_NO_ADDRESS_SAFETY_ANALYSIS #if __LP64__ || defined(_WIN64) # define SANITIZER_WORDSIZE 64 -- 2.7.4