From 33f8c3a901cac9cd977d628c7bcf051a60f01969 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20v=2E=20L=C3=B6wis?= <martin@v.loewis.de>
Date: Wed, 1 Aug 2012 10:05:27 +0200
Subject: [PATCH] Issue #8847: Disable COMDAT folding in Windows PGO builds.

---
 Misc/NEWS                    | 2 ++
 PCbuild/pginstrument.vsprops | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 847089daf87..e989b5b08db 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 38c5f18ed31..99c117b1526 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"