diff options
| author | kcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-21 10:57:10 +0000 |
|---|---|---|
| committer | kcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-02-21 10:57:10 +0000 |
| commit | 5a59af672d2dc6fb5e5076afe633f4af10211201 (patch) | |
| tree | 0ad34c195787ec507c5bcdbb710bf127eb3a2fb5 /libsanitizer/include | |
| parent | 7662ff7e3f8b2ae2bfdc2bb5c79306b938dff3f4 (diff) | |
| download | gcc-5a59af672d2dc6fb5e5076afe633f4af10211201.tar.gz | |
libsanitizer merge from upstream r175733
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@196201 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer/include')
| -rw-r--r-- | libsanitizer/include/sanitizer/asan_interface.h | 4 | ||||
| -rw-r--r-- | libsanitizer/include/sanitizer/common_interface_defs.h | 5 |
2 files changed, 7 insertions, 2 deletions
diff --git a/libsanitizer/include/sanitizer/asan_interface.h b/libsanitizer/include/sanitizer/asan_interface.h index 18696a681ed..0016339e486 100644 --- a/libsanitizer/include/sanitizer/asan_interface.h +++ b/libsanitizer/include/sanitizer/asan_interface.h @@ -35,8 +35,8 @@ extern "C" { // (un)poison memory in the same memory region simultaneously. void __asan_unpoison_memory_region(void const volatile *addr, size_t size); - // User code should use macro instead of functions. -#if __has_feature(address_sanitizer) +// User code should use macros instead of functions. +#if __has_feature(address_sanitizer) || defined(__SANITIZE_ADDRESS__) #define ASAN_POISON_MEMORY_REGION(addr, size) \ __asan_poison_memory_region((addr), (size)) #define ASAN_UNPOISON_MEMORY_REGION(addr, size) \ diff --git a/libsanitizer/include/sanitizer/common_interface_defs.h b/libsanitizer/include/sanitizer/common_interface_defs.h index b61b8a1a636..c218b5b5654 100644 --- a/libsanitizer/include/sanitizer/common_interface_defs.h +++ b/libsanitizer/include/sanitizer/common_interface_defs.h @@ -14,6 +14,11 @@ #include <stddef.h> #include <stdint.h> +// GCC does not understand __has_feature. +#if !defined(__has_feature) +# define __has_feature(x) 0 +#endif + #ifdef __cplusplus extern "C" { #endif |