From: Martin v. Löwis <martin@v.loewis.de>
Date: Wed, 1 Aug 2012 08:05:27 +0000 (+0200)
Subject: Issue #8847: Disable COMDAT folding in Windows PGO builds.
X-Git-Tag: v2.7.4rc1~673
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=33f8c3a901cac9cd977d628c7bcf051a60f01969;p=thirdparty%2FPython%2Fcpython.git

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

diff --git a/Misc/NEWS b/Misc/NEWS
index 847089daf873..e989b5b08dba 100644
--- 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 38c5f18ed316..99c117b15267 100644
--- a/PCbuild/pginstrument.vsprops
+++ b/PCbuild/pginstrument.vsprops
@@ -22,7 +22,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		OptimizeReferences="2"
-		EnableCOMDATFolding="2"
+		EnableCOMDATFolding="1"
 		LinkTimeCodeGeneration="2"
 		ProfileGuidedDatabase="$(SolutionDir)$(PlatformName)-pgi\$(TargetName).pgd"
 		ImportLibrary="$(OutDirPGI)\$(TargetName).lib"