commit 849289e531a97895784ab86b550e43d190618dff
author Daniel Dunbar <daniel@zuster.org> Mon Oct 22 18:51:13 2012 +0000
committer Daniel Dunbar <daniel@zuster.org> Mon Oct 22 18:51:13 2012 +0000
tree b99460a5a670b02d1e297af9bacf1fee0fe54d8e
parent a930dc9b46572cb6e5bb54f3d724e8fe23a6b66e

driver/Darwin: Follow up to last patch, M-class CPUs are AAPCS but not EABI.

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

lib/Basic/Targets.cpp

diff --git a/lib/Basic/Targets.cpp b/lib/Basic/Targets.cpp
index cd83502..3481b59 100644
--- a/lib/Basic/Targets.cpp
+++ b/lib/Basic/Targets.cpp
@@ -3213,7 +3213,9 @@
       Builder.defineMacro("__THUMB_INTERWORK__");
 
     if (ABI == "aapcs" || ABI == "aapcs-linux") {
-      Builder.defineMacro("__ARM_EABI__");
+      // M-class CPUs on Darwin follow AAPCS, but not EABI.
+      if (!(getTriple().isOSDarwin() == llvm::Triple::IOS && CPUProfile == "M"))
+        Builder.defineMacro("__ARM_EABI__");
       Builder.defineMacro("__ARM_PCS", "1");
 
       if (!SoftFloat && !SoftFloatABI)