summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Northover <tnorthover@apple.com>2017-08-18 00:33:24 +0000
committerTim Northover <tnorthover@apple.com>2017-08-18 00:33:24 +0000
commitb6a826bdc7cea06800ece8197f7af0271b2e6639 (patch)
tree7e3023d7c775afc3db7c7b3cf99b228be58a3200
parentc0541dfa3e8b6e047e11edba3d6f9bc134dbb1a8 (diff)
downloadbcm5719-llvm-b6a826bdc7cea06800ece8197f7af0271b2e6639.tar.gz
bcm5719-llvm-b6a826bdc7cea06800ece8197f7af0271b2e6639.zip
Revert r311137 (GlobalISel ABI commit).
It was committed by mistake since it was in the same monorepo as the LLVM change I was working on. llvm-svn: 311140
-rw-r--r--clang/lib/Driver/ToolChains/Arch/ARM.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains/Arch/ARM.cpp b/clang/lib/Driver/ToolChains/Arch/ARM.cpp
index c69efd96e80..49bb23535d7 100644
--- a/clang/lib/Driver/ToolChains/Arch/ARM.cpp
+++ b/clang/lib/Driver/ToolChains/Arch/ARM.cpp
@@ -438,7 +438,7 @@ void arm::getARMTargetFeatures(const ToolChain &TC,
//
// The above behavior is consistent with GCC.
int VersionNum = getARMSubArchVersionNumber(Triple);
- if (Triple.isOSBinFormatMachO() || Triple.isOSNetBSD()) {
+ if (Triple.isOSDarwin() || Triple.isOSNetBSD()) {
if (VersionNum < 6 ||
Triple.getSubArch() == llvm::Triple::SubArchType::ARMSubArch_v6m)
Features.push_back("+strict-align");
OpenPOWER on IntegriCloud