Match things like 'armv5tejl-unknown-linux-gnu' for PR2290

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@50698 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp
index 1b5137322e4964288c6c7865ca844f80a3e3616f..d084fffa22f4cc21ad5cb501cc2256f1f958c11e 100644 (file)
--- a/lib/Target/ARM/ARMTargetMachine.cpp
+++ b/lib/Target/ARM/ARMTargetMachine.cpp
@@ -94,7 +94,8 @@ unsigned ARMTargetMachine::getJITMatchQuality() {
 
 unsigned ARMTargetMachine::getModuleMatchQuality(const Module &M) {
   std::string TT = M.getTargetTriple();
-  if (TT.size() >= 4 && std::string(TT.begin(), TT.begin()+4) == "arm-")
+  if (TT.size() >= 4 && // Match arm-foo-bar, as well as things like armv5blah-*
+      (TT.substr(0, 4) == "arm-" || TT.substr(0, 4) == "armv"))
     return 20;
   // If the target triple is something non-arm, we don't match.
   if (!TT.empty()) return 0;