diff options
| author | David Chisnall <csdavec@swan.ac.uk> | 2018-09-04 10:07:27 +0000 |
|---|---|---|
| committer | David Chisnall <csdavec@swan.ac.uk> | 2018-09-04 10:07:27 +0000 |
| commit | ef16ea7f7ade8dbe3647e7c829a13d1dbeee0f0e (patch) | |
| tree | b70341799a6d77a81c41ca906dfa5388f8958c20 | |
| parent | 6d924ad2bccfc463ff20e2e255f515883b7674ed (diff) | |
| download | bcm5719-llvm-ef16ea7f7ade8dbe3647e7c829a13d1dbeee0f0e.tar.gz bcm5719-llvm-ef16ea7f7ade8dbe3647e7c829a13d1dbeee0f0e.zip | |
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.
llvm-svn: 341352
| -rw-r--r-- | clang/lib/Driver/ToolChains/Clang.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp index d803a929cfc..ff083c79f10 100644 --- a/clang/lib/Driver/ToolChains/Clang.cpp +++ b/clang/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(); |
