summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--compiler-rt/lib/asan/asan_interface.h5
-rw-r--r--compiler-rt/lib/asan/asan_internal.h2
2 files changed, 5 insertions, 2 deletions
diff --git a/compiler-rt/lib/asan/asan_interface.h b/compiler-rt/lib/asan/asan_interface.h
index f9a2e0e88b9..0f20a4cf555 100644
--- a/compiler-rt/lib/asan/asan_interface.h
+++ b/compiler-rt/lib/asan/asan_interface.h
@@ -87,7 +87,10 @@ extern "C" {
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) \
diff --git a/compiler-rt/lib/asan/asan_internal.h b/compiler-rt/lib/asan/asan_internal.h
index 3e9faa8dd0b..df1814cf3b2 100644
--- a/compiler-rt/lib/asan/asan_internal.h
+++ b/compiler-rt/lib/asan/asan_internal.h
@@ -110,7 +110,7 @@ extern "C" void* _ReturnAddress(void);
#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
OpenPOWER on IntegriCloud