From: Oliver Stannard Date: Thu, 4 Sep 2014 10:38:53 +0000 (+0000) Subject: ARM: Default to apcs-gnu ABI for NetBSD X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=454c2087b9422c4f45864cab7b535cd4daec1195;p=clang ARM: Default to apcs-gnu ABI for NetBSD r216662 changed the default ABI for 32-bit ARM targets to be "aapcs" when no environment is given in the triple, however NetBSD requires it to be "apcs-gnu". git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@217141 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Driver/Tools.cpp b/lib/Driver/Tools.cpp index df2f9cfa4c..2f148306ef 100644 --- a/lib/Driver/Tools.cpp +++ b/lib/Driver/Tools.cpp @@ -755,9 +755,14 @@ void Clang::AddARMTargetArgs(const ArgList &Args, break; case llvm::Triple::EABIHF: case llvm::Triple::EABI: - default: ABIName = "aapcs"; break; + default: + if (Triple.getOS() == llvm::Triple::NetBSD) + ABIName = "apcs-gnu"; + else + ABIName = "aapcs"; + break; } } CmdArgs.push_back("-target-abi"); diff --git a/test/Driver/arm-abi.c b/test/Driver/arm-abi.c index 1186316ad5..812a849110 100644 --- a/test/Driver/arm-abi.c +++ b/test/Driver/arm-abi.c @@ -20,6 +20,14 @@ // RUN: %clang -target arm--windows-gnueabi %s -### -o %t.o 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK-AAPCS %s +// NetBSD defaults to apcs-gnu, but can also use aapcs +// RUN: %clang -target arm--netbsd- %s -### -o %t.o 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-APCS-GNU %s +// RUN: %clang -target arm--netbsd-eabi %s -### -o %t.o 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-AAPCS %s +// RUN: %clang -target arm--netbsd-eabihf %s -### -o %t.o 2>&1 \ +// RUN: | FileCheck -check-prefix=CHECK-AAPCS %s + // Otherwise, ABI is celected based on environment // RUN: %clang -target arm---android %s -### -o %t.o 2>&1 \ // RUN: | FileCheck -check-prefix=CHECK-AAPCS-LINUX %s