Revert the default changing behavior part of r216662 until we

can change the backend to be the same default. Leave the
modified/new testcases with the exception of the default behavior
since it increases our testing footprint.

llvm-svn: 223976

diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 151d87b..67393ee 100644 (file)
--- a/clang/lib/Driver/Tools.cpp
+++ b/clang/lib/Driver/Tools.cpp
@@ -793,11 +793,10 @@ 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:
-      if (Triple.getOS() == llvm::Triple::NetBSD)
-        ABIName = "apcs-gnu";
-      else
-        ABIName = "aapcs";
+      ABIName = "apcs-gnu";
       break;
     }
   }

diff --git a/clang/test/Driver/arm-abi.c b/clang/test/Driver/arm-abi.c
index 812a849..937b378 100644 (file)
--- a/clang/test/Driver/arm-abi.c
+++ b/clang/test/Driver/arm-abi.c
@@ -1,12 +1,12 @@
-// The default ABI is aapcs
+// The default ABI is apcs
 // RUN: %clang -target arm--- %s -### -o %t.o 2>&1 \
-// RUN:   | FileCheck -check-prefix=CHECK-AAPCS %s
+// RUN:   | FileCheck -check-prefix=CHECK-APCS-GNU %s
 // RUN: %clang -target armeb--- %s -### -o %t.o 2>&1 \
-// RUN:   | FileCheck -check-prefix=CHECK-AAPCS %s
+// RUN:   | FileCheck -check-prefix=CHECK-APCS-GNU %s
 // RUN: %clang -target thumb--- %s -### -o %t.o 2>&1 \
-// RUN:   | FileCheck -check-prefix=CHECK-AAPCS %s
+// RUN:   | FileCheck -check-prefix=CHECK-APCS-GNU %s
 // RUN: %clang -target thumbeb--- %s -### -o %t.o 2>&1 \
-// RUN:   | FileCheck -check-prefix=CHECK-AAPCS %s
+// RUN:   | FileCheck -check-prefix=CHECK-APCS-GNU %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 \