aboutsummaryrefslogtreecommitdiff
path: root/clang/lib/Driver/Tools.cpp
diff options
context:
space:
mode:
authorEric Christopher <echristo@gmail.com>2014-12-10 22:58:32 +0000
committerEric Christopher <echristo@gmail.com>2014-12-10 22:58:32 +0000
commit3c1176c888afaf4caaa51eb7b57ad6d157b77ed2 (patch)
tree8a11692d36f6c3726e45444b924e7494b1f2aa9c /clang/lib/Driver/Tools.cpp
parent18fac3b1dd8026953dbac543c85696cd9388ba42 (diff)
downloadllvm-3c1176c888afaf4caaa51eb7b57ad6d157b77ed2.zip
llvm-3c1176c888afaf4caaa51eb7b57ad6d157b77ed2.tar.gz
llvm-3c1176c888afaf4caaa51eb7b57ad6d157b77ed2.tar.bz2
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
Diffstat (limited to 'clang/lib/Driver/Tools.cpp')
-rw-r--r--clang/lib/Driver/Tools.cpp7
1 files changed, 3 insertions, 4 deletions
diff --git a/clang/lib/Driver/Tools.cpp b/clang/lib/Driver/Tools.cpp
index 151d87b..67393ee 100644
--- 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;
}
}