[Lldb-commits] [lldb] r211536 - Don't set the ABI to apcs-gnu for non-ARM iOS targets (i.e., the

[Sean Callanan]

Author: spyffe
Date: Mon Jun 23 16:00:25 2014
New Revision: 211536

URL: http://llvm.org/viewvc/llvm-project?rev=211536&view=rev
Log:
Don't set the ABI to apcs-gnu for non-ARM iOS targets (i.e., the
simulator).
    
<rdar://problem/17399406>

Modified:
    lldb/trunk/source/Expression/ClangExpressionParser.cpp

Modified: lldb/trunk/source/Expression/ClangExpressionParser.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Expression/ClangExpressionParser.cpp?rev=211536&r1=211535&r2=211536&view=diff
==============================================================================
--- lldb/trunk/source/Expression/ClangExpressionParser.cpp (original)
+++ lldb/trunk/source/Expression/ClangExpressionParser.cpp Mon Jun 23 16:00:25 2014
@@ -157,8 +157,9 @@ ClangExpressionParser::ClangExpressionPa
     }
     
     // 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";
     }