[llvm-commits] [compiler-rt] r154203 - in /compiler-rt/trunk/lib/asan: asan_interface.h asan_internal.h

[Kostya Serebryany]

Author: kcc
Date: Fri Apr  6 15:36:18 2012
New Revision: 154203

URL: http://llvm.org/viewvc/llvm-project?rev=154203&view=rev
Log:
[asan] last bit for gcc compatibility

Modified:
    compiler-rt/trunk/lib/asan/asan_interface.h
    compiler-rt/trunk/lib/asan/asan_internal.h

Modified: compiler-rt/trunk/lib/asan/asan_interface.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interface.h?rev=154203&r1=154202&r2=154203&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_interface.h (original)
+++ compiler-rt/trunk/lib/asan/asan_interface.h Fri Apr  6 15:36:18 2012
@@ -87,7 +87,10 @@
   void __asan_handle_no_return() ASAN_INTERFACE_FUNCTION_ATTRIBUTE;
 
 // User code should use macro instead of functions.
-#if defined(__has_feature) && __has_feature(address_sanitizer)
+#if !defined(__has_feature)
+#define __has_feature(x) 0
+#endif
+#if __has_feature(address_sanitizer)
 #define ASAN_POISON_MEMORY_REGION(addr, size) \
   __asan_poison_memory_region((addr), (size))
 #define ASAN_UNPOISON_MEMORY_REGION(addr, size) \

Modified: compiler-rt/trunk/lib/asan/asan_internal.h
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_internal.h?rev=154203&r1=154202&r2=154203&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_internal.h (original)
+++ compiler-rt/trunk/lib/asan/asan_internal.h Fri Apr  6 15:36:18 2012
@@ -110,7 +110,7 @@
 #define __has_feature(x) 0
 #endif
 
-#if defined(__has_feature) && __has_feature(address_sanitizer)
+#if __has_feature(address_sanitizer)
 # error "The AddressSanitizer run-time should not be"
         " instrumented by AddressSanitizer"
 #endif