commit faf300f0695350a13c598e204d9fbd7ab969739f
author Peter Collingbourne <peter@pcc.me.uk> Fri Aug 24 20:38:15 2018 +0000
committer Peter Collingbourne <peter@pcc.me.uk> Fri Aug 24 20:38:15 2018 +0000
tree 586b54e1e95e30b9e7516ba19425e8851f5c1c60
parent 3f792230cb998c0bbb3a3c3044d82b0c20066a09

Reland r340552, "Driver: Enable address-significance tables by default when targeting COFF." which was reverted in r340579.

The underlying problem that caused the revert was fixed in r340648.

Differential Revision: https://reviews.llvm.org/D51049

llvm-svn: 340649

clang/lib/Driver/ToolChains/Clang.cpp

diff --git a/clang/lib/Driver/ToolChains/Clang.cpp b/clang/lib/Driver/ToolChains/Clang.cpp
index 45c63d5..8d73db1 100644
--- a/clang/lib/Driver/ToolChains/Clang.cpp
+++ b/clang/lib/Driver/ToolChains/Clang.cpp
@@ -4857,7 +4857,8 @@
   }
 
   if (Args.hasFlag(options::OPT_faddrsig, options::OPT_fno_addrsig,
-                   getToolChain().getTriple().isOSBinFormatELF() &&
+                   (getToolChain().getTriple().isOSBinFormatELF() ||
+                    getToolChain().getTriple().isOSBinFormatCOFF()) &&
                        getToolChain().useIntegratedAs()))
     CmdArgs.push_back("-faddrsig");