Reinstate aapcs as the default arm abi.

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

diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp
index 111a38348093a33d0c31c7df5c1e9414a3ef658c..77e4e125e6e06791b749babad8f0bbe3491378ee 100644 (file)
--- a/lib/Driver/Tools.cpp
+++ b/lib/Driver/Tools.cpp
@@ -794,10 +794,11 @@ void Clang::AddARMTargetArgs(const ArgList &Args,
     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;
     }
   }

diff --git a/test/Driver/arm-abi.c b/test/Driver/arm-abi.c
index 937b378c80ec94f490db8947d658545abbb66ad3..812a849110ec4ff3ac7072ae28f50548432e8cac 100644 (file)
--- a/test/Driver/arm-abi.c
+++ b/test/Driver/arm-abi.c
@@ -1,12 +1,12 @@
-// The default ABI is apcs
+// The default ABI is aapcs
 // RUN: %clang -target arm--- %s -### -o %t.o 2>&1 \
-// RUN:   | FileCheck -check-prefix=CHECK-APCS-GNU %s
+// RUN:   | FileCheck -check-prefix=CHECK-AAPCS %s
 // RUN: %clang -target armeb--- %s -### -o %t.o 2>&1 \
-// RUN:   | FileCheck -check-prefix=CHECK-APCS-GNU %s
+// RUN:   | FileCheck -check-prefix=CHECK-AAPCS %s
 // RUN: %clang -target thumb--- %s -### -o %t.o 2>&1 \
-// RUN:   | FileCheck -check-prefix=CHECK-APCS-GNU %s
+// RUN:   | FileCheck -check-prefix=CHECK-AAPCS %s
 // RUN: %clang -target thumbeb--- %s -### -o %t.o 2>&1 \
-// RUN:   | FileCheck -check-prefix=CHECK-APCS-GNU %s
+// RUN:   | FileCheck -check-prefix=CHECK-AAPCS %s
 
 // MachO targets default to apcs-gnu, except for m-class processors
 // RUN: %clang -target arm--darwin- -arch armv7s %s -### -o %t.o 2>&1 \