Issue #8847: Disable COMDAT folding in Windows PGO builds.

diff --git a/Misc/NEWS b/Misc/NEWS
index 847089daf8736bda5dadc3fa626a42b47c579880..e989b5b08dba8842a8793840d643a0e85cad7638 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -315,6 +315,8 @@ Tests
 Build
 -----
 
+- Issue #8847: Disable COMDAT folding in Windows PGO builds.
+
 - Issue #14018: Fix OS X Tcl/Tk framework checking when using OS X SDKs.
 
 - Issue #8767: Restore building with --disable-unicode.

diff --git a/PCbuild/pginstrument.vsprops b/PCbuild/pginstrument.vsprops
index 38c5f18ed316c14585c1e89ae529454cab62c5bb..99c117b15267f071c40aeeb5fbfa7745819b018a 100644 (file)
--- a/PCbuild/pginstrument.vsprops
+++ b/PCbuild/pginstrument.vsprops
@@ -22,7 +22,7 @@
        <Tool\r
                Name="VCLinkerTool"\r
                OptimizeReferences="2"\r
-               EnableCOMDATFolding="2"\r
+               EnableCOMDATFolding="1"\r
                LinkTimeCodeGeneration="2"\r
                ProfileGuidedDatabase="$(SolutionDir)$(PlatformName)-pgi\$(TargetName).pgd"\r
                ImportLibrary="$(OutDirPGI)\$(TargetName).lib"\r