From fefddbef531cdb76ba2f64d14412230274edc29c Mon Sep 17 00:00:00 2001 From: Maxim Ostapenko Date: Thu, 21 Apr 2016 12:19:54 +0000 Subject: [PATCH] Cherry-pick r266868 from upstream. PR sanitizer/70624 * asan/asan_mac.cc: Cherry pick upstream r266868. From-SVN: r235338 --- libsanitizer/ChangeLog | 5 +++++ libsanitizer/asan/asan_mac.cc | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index c6cdc09badc..1268507b92b 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,8 @@ +2016-04-21 Maxim Ostapenko + + PR sanitizer/70624 + * asan/asan_mac.cc: Cherry pick upstream r266868. + 2016-01-19 Jakub Jelinek PR sanitizer/68824 diff --git a/libsanitizer/asan/asan_mac.cc b/libsanitizer/asan/asan_mac.cc index 20e37ffe7ef..ab3c6560825 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