r311140 - Revert r311137 (GlobalISel ABI commit).

[Tim Northover via cfe-commits]

Author: tnorthover
Date: Thu Aug 17 17:33:24 2017
New Revision: 311140

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

Modified:
    cfe/trunk/lib/Driver/ToolChains/Arch/ARM.cpp

Modified: cfe/trunk/lib/Driver/ToolChains/Arch/ARM.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Arch/ARM.cpp?rev=311140&r1=311139&r2=311140&view=diff
==============================================================================
--- cfe/trunk/lib/Driver/ToolChains/Arch/ARM.cpp (original)
+++ cfe/trunk/lib/Driver/ToolChains/Arch/ARM.cpp Thu Aug 17 17:33:24 2017
@@ -438,7 +438,7 @@ void arm::getARMTargetFeatures(const Too
     //
     // 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");