r224490 - Reinstate aapcs as the default arm abi.

[Eric Christopher]

Author: echristo
Date: Wed Dec 17 20:08:51 2014
New Revision: 224490

URL: http://llvm.org/viewvc/llvm-project?rev=224490&view=rev
Log:
Reinstate aapcs as the default arm abi.

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=224490&r1=224489&r2=224490&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/Tools.cpp (original)
+++ cfe/trunk/lib/Driver/Tools.cpp Wed Dec 17 20:08:51 2014
@@ -794,10 +794,11 @@ void Clang::AddARMTargetArgs(const ArgLi
     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;
     }
   }

Modified: cfe/trunk/test/Driver/arm-abi.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/arm-abi.c?rev=224490&r1=224489&r2=224490&view=diff
==============================================================================
--- cfe/trunk/test/Driver/arm-abi.c (original)
+++ cfe/trunk/test/Driver/arm-abi.c Wed Dec 17 20:08:51 2014
@@ -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 \