commit 7a8b31d631acb9c1b7b1e654fcbfd476ac502c0f
author Eric Christopher <echristo@gmail.com> Thu Dec 18 02:08:51 2014 +0000
committer Eric Christopher <echristo@gmail.com> Thu Dec 18 02:08:51 2014 +0000
tree 5fe647f06d87c57cc9d496bace9e7a72a01fd27b
parent 1971c3508a3e781104803d750496339460dfac1e

Reinstate aapcs as the default arm abi.

llvm-svn: 224490

clang/lib/Driver/Tools.cpp

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 111a383..77e4e12 100644
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -794,10 +794,11 @@
     case llvm::Triple::EABI:
       ABIName = "aapcs";
       break;
-    // This is also the case for netbsd.
-    case llvm::Triple::GNU:
     default:
-      ABIName = "apcs-gnu";
+      if (Triple.getOS() == llvm::Triple::NetBSD)
+        ABIName = "apcs-gnu";
+      else
+        ABIName = "aapcs";
       break;
     }
   }