commit 396ed67950ce8559da1c7ea896a1cfe86fd3b27a
author Evgeniy Stepanov <eugeni.stepanov@gmail.com> Thu Nov 16 02:52:19 2017 +0000
committer Evgeniy Stepanov <eugeni.stepanov@gmail.com> Thu Nov 16 02:52:19 2017 +0000
tree a7e719809d4f5b0ae29e9c1ae3ac9544967af65f
parent e6601fd30e0dd263af466a58bc6b09bfff1eed31

[asan] Fallback to non-ifunc dynamic shadow on android<22.

Summary: Android < 22 does not support ifunc.

Reviewers: pcc

Subscribers: srhines, kubamracek, hiraditya, llvm-commits

Differential Revision: https://reviews.llvm.org/D40116

llvm-svn: 318369

llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp

diff --git a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
index 9681de4..967464f 100644
--- a/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
+++ b/llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
@@ -565,7 +565,9 @@
   Mapping.OrShadowOffset = !IsAArch64 && !IsPPC64 && !IsSystemZ && !IsPS4CPU &&
                            !(Mapping.Offset & (Mapping.Offset - 1)) &&
                            Mapping.Offset != kDynamicShadowSentinel;
-  Mapping.InGlobal = ClWithIfunc && IsAndroid && IsArmOrThumb;
+  bool IsAndroidWithIfuncSupport =
+      IsAndroid && !TargetTriple.isAndroidVersionLT(21);
+  Mapping.InGlobal = ClWithIfunc && IsAndroidWithIfuncSupport && IsArmOrThumb;
 
   return Mapping;
 }