diff options
| author | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-11-20 10:49:47 +0000 |
|---|---|---|
| committer | ro <ro@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-11-20 10:49:47 +0000 |
| commit | a11195e151cbfb204745b8a0a4ebdbf79ec0ec7d (patch) | |
| tree | e0646a17c02687c46ede7df11ce8ea0fa032343d /libsanitizer | |
| parent | f8ea0667c4ece0333a7e006da0aed8e50b15bf88 (diff) | |
Fix libsanitizer build on OS X 10.1[01], macOS 10.12 (PR sanitizer/78267)
fixincludes:
PR sanitizer/78267
* inclhack.def (darwin_availabilityinternal, darwin_os_trace_1)
(darwin_os_trace_2, darwin_os_trace_3): New fixes.
(hpux_stdint_least_fast): Remove spurious _EOFix_.
* fixincl.x: Regenerate.
* tests/bases/AvailabilityInternal.h: New file.
* tests/bases/os/trace.h: New file.
2016-11-20 Jack Howarth <howarth.at.gcc@gmail.com>
libsanitizer:
PR sanitizer/78267
* sanitizer_common/sanitizer_mac.cc: Include <os/trace.h> only if
compiler supports blocks extension.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@242633 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 6 | ||||
| -rw-r--r-- | libsanitizer/sanitizer_common/sanitizer_mac.cc | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 844f532d46d7..5ac40280fd96 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,9 @@ +2016-11-20 Jack Howarth <howarth.at.gcc@gmail.com> + + PR sanitizer/78267 + * sanitizer_common/sanitizer_mac.cc: Include <os/trace.h> only if + compiler supports blocks extension. + 2016-11-16 Markus Trippelsdorf <markus@trippelsdorf.de> * LOCAL_PATCHES: Add revision. diff --git a/libsanitizer/sanitizer_common/sanitizer_mac.cc b/libsanitizer/sanitizer_common/sanitizer_mac.cc index 4408d1dccb96..62be7b0b15e7 100644 --- a/libsanitizer/sanitizer_common/sanitizer_mac.cc +++ b/libsanitizer/sanitizer_common/sanitizer_mac.cc @@ -34,7 +34,7 @@ extern char **environ; #endif -#if defined(__has_include) && __has_include(<os/trace.h>) +#if defined(__has_include) && __has_include(<os/trace.h>) && defined(__BLOCKS__) #define SANITIZER_OS_TRACE 1 #include <os/trace.h> #else |