Cherry-pick r266868 from upstream.

PR sanitizer/70624                                                                                                             
	* asan/asan_mac.cc: Cherry pick upstream r266868.

From-SVN: r235338
This commit is contained in:
Maxim Ostapenko 2016-04-21 12:19:54 +00:00 committed by Maxim Ostapenko
parent aef4aab0cc
commit fefddbef53
2 changed files with 10 additions and 1 deletions

View File

@ -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> 2016-01-19 Jakub Jelinek <jakub@redhat.com>
PR sanitizer/68824 PR sanitizer/68824

View File

@ -97,10 +97,14 @@ void DisableReexec() {
reexec_disabled = true; reexec_disabled = true;
} }
extern "C" double dyldVersionNumber; extern "C" SANITIZER_WEAK_ATTRIBUTE double dyldVersionNumber;
static const double kMinDyldVersionWithAutoInterposition = 360.0; static const double kMinDyldVersionWithAutoInterposition = 360.0;
bool DyldNeedsEnvVariable() { 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 // 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 // DYLD_INSERT_LIBRARIES is not set. However, checking OS version via
// GetMacosVersion() doesn't work for the simulator. Let's instead check // GetMacosVersion() doesn't work for the simulator. Let's instead check