r223976 - Revert the default changing behavior part of r216662 until we

[Eric Christopher]

Author: echristo
Date: Wed Dec 10 16:58:32 2014
New Revision: 223976

URL: http://llvm.org/viewvc/llvm-project?rev=223976&view=rev
Log:
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.

Modified:
    cfe/trunk/lib/Driver/Tools.cpp
    cfe/trunk/test/Driver/arm-abi.c

Modified: cfe/trunk/lib/Driver/Tools.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/Tools.cpp?rev=223976&r1=223975&r2=223976&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Wed Dec 10 16:58:32 2014
@@ -793,11 +793,10 @@ void Clang::AddARMTargetArgs(const ArgLi
     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;
     }
   }

Modified: cfe/trunk/test/Driver/arm-abi.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/arm-abi.c?rev=223976&r1=223975&r2=223976&view=diff
==============================================================================
--- cfe/trunk/test/Driver/arm-abi.c (original)
+++ cfe/trunk/test/Driver/arm-abi.c Wed Dec 10 16:58:32 2014
@@ -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 \