diff options
| author | Maxim Ostapenko <m.ostapenko@samsung.com> | 2016-04-21 12:19:54 +0000 |
|---|---|---|
| committer | Maxim Ostapenko <chefmax@gcc.gnu.org> | 2016-04-21 15:19:54 +0300 |
| commit | fefddbef531cdb76ba2f64d14412230274edc29c (patch) | |
| tree | 86e2a618afcde29289c3bef8c0129d1db3a35681 /libsanitizer | |
| parent | aef4aab0ccd07040e6471dfce538e2e8338a9ff8 (diff) | |
| download | gcc-fefddbef531cdb76ba2f64d14412230274edc29c.zip gcc-fefddbef531cdb76ba2f64d14412230274edc29c.tar.gz gcc-fefddbef531cdb76ba2f64d14412230274edc29c.tar.bz2 | |
Cherry-pick r266868 from upstream.
PR sanitizer/70624
* asan/asan_mac.cc: Cherry pick upstream r266868.
From-SVN: r235338
Diffstat (limited to 'libsanitizer')
| -rw-r--r-- | libsanitizer/ChangeLog | 5 | ||||
| -rw-r--r-- | libsanitizer/asan/asan_mac.cc | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index c6cdc09..1268507 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,8 @@ +2016-04-21 Maxim Ostapenko <m.ostapenko@samsung.com> + + PR sanitizer/70624 + * asan/asan_mac.cc: Cherry pick upstream r266868. + 2016-01-19 Jakub Jelinek <jakub@redhat.com> PR sanitizer/68824 diff --git a/libsanitizer/asan/asan_mac.cc b/libsanitizer/asan/asan_mac.cc index 20e37ff..ab3c656 100644 --- a/libsanitizer/asan/asan_mac.cc +++ b/libsanitizer/asan/asan_mac.cc @@ -97,10 +97,14 @@ void DisableReexec() { reexec_disabled = true; } -extern "C" double dyldVersionNumber; +extern "C" SANITIZER_WEAK_ATTRIBUTE double dyldVersionNumber; static const double kMinDyldVersionWithAutoInterposition = 360.0; bool DyldNeedsEnvVariable() { + // Although sanitizer support was added to LLVM on OS X 10.7+, GCC users + // still may want use them on older systems. On older Darwin platforms, dyld + // doesn't export dyldVersionNumber symbol and we simply return true. + if (!&dyldVersionNumber) return true; // If running on OS X 10.11+ or iOS 9.0+, dyld will interpose even if // DYLD_INSERT_LIBRARIES is not set. However, checking OS version via // GetMacosVersion() doesn't work for the simulator. Let's instead check |