commit 60400ecbce6cae9c0f4a60f2bbab23d82dcede01
author Sean Callanan <scallanan@apple.com> Mon Jun 23 21:00:25 2014 +0000
committer Sean Callanan <scallanan@apple.com> Mon Jun 23 21:00:25 2014 +0000
tree 5a23aa890928ac714756b68df6fe23d6ce2a1761
parent 9b0957870c36d40eaef1e614059cce80e45b61c1

Don't set the ABI to apcs-gnu for non-ARM iOS targets (i.e., the
simulator).
    
<rdar://problem/17399406>

llvm-svn: 211536

lldb/source/Expression/ClangExpressionParser.cpp

diff --git a/lldb/source/Expression/ClangExpressionParser.cpp b/lldb/source/Expression/ClangExpressionParser.cpp
index 37ebfcc..bac72c3 100644
--- a/lldb/source/Expression/ClangExpressionParser.cpp
+++ b/lldb/source/Expression/ClangExpressionParser.cpp
@@ -157,8 +157,9 @@
     }
     
     // Any arm32 iOS environment, but not on arm64
-    if (m_compiler->getTargetOpts().Triple.find("arm64") == std::string::npos
-        && m_compiler->getTargetOpts().Triple.find("ios") != std::string::npos)
+    if (m_compiler->getTargetOpts().Triple.find("arm64") == std::string::npos &&
+        m_compiler->getTargetOpts().Triple.find("arm") != std::string::npos &&
+        m_compiler->getTargetOpts().Triple.find("ios") != std::string::npos)
     {
         m_compiler->getTargetOpts().ABI = "apcs-gnu";
     }