From: David Chisnall <csdavec@swan.ac.uk>
Date: Tue, 4 Sep 2018 10:07:27 +0000 (+0000)
Subject: Revert "Disable the GNUstep v2 ABI on Windows."
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e2e8b670f4aeef2d5c846f8ebde14b2e11e7d4a;p=clang

Revert "Disable the GNUstep v2 ABI on Windows."

This reverts commit b4547c9cadd2f8adfe3f3182e4c56e466c5256cb.

Apparently git llvm push from the monorepo does not respect branches and
pushes the current branch to master.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@341352 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/lib/Driver/ToolChains/Clang.cpp b/lib/Driver/ToolChains/Clang.cpp
index d803a929cf..ff083c79f1 100644
--- a/lib/Driver/ToolChains/Clang.cpp
+++ b/lib/Driver/ToolChains/Clang.cpp
@@ -4949,7 +4949,8 @@ ObjCRuntime Clang::AddObjCRuntimeArgs(const ArgList &args,
     }
     if ((runtime.getKind() == ObjCRuntime::GNUstep) &&
         (runtime.getVersion() >= VersionTuple(2, 0)))
-      if (!getToolChain().getTriple().isOSBinFormatELF()) {
+      if (!getToolChain().getTriple().isOSBinFormatELF() &&
+          !getToolChain().getTriple().isOSBinFormatCOFF()) {
         getToolChain().getDriver().Diag(
             diag::err_drv_gnustep_objc_runtime_incompatible_binary)
           << runtime.getVersion().getMajor();