http://hg.python.org/cpython/rev/029cde4e58c5 changeset: 78367:029cde4e58c5 parent: 78364:c58f65e22fe9 user: Martin v. Löwis <martin@v.loewis.de> date: Wed Aug 01 11:06:53 2012 +0200 summary: Issue #8847: Disable COMDAT folding in Windows PGO builds. Patch by Stefan Krah. files: PCbuild/pginstrument.props | 4 ++-- PCbuild/pylauncher.vcxproj | 14 +++++++------- PCbuild/pywlauncher.vcxproj | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/PCbuild/pginstrument.props b/PCbuild/pginstrument.props --- a/PCbuild/pginstrument.props +++ b/PCbuild/pginstrument.props @@ -24,7 +24,7 @@ </ClCompile> <Link> <OptimizeReferences>true</OptimizeReferences> - <EnableCOMDATFolding>true</EnableCOMDATFolding> + <EnableCOMDATFolding>false</EnableCOMDATFolding> <LinkTimeCodeGeneration>PGInstrument</LinkTimeCodeGeneration> <ProfileGuidedDatabase>$(SolutionDir)$(Platform)-pgi\$(TargetName).pgd</ProfileGuidedDatabase> <ImportLibrary>$(OutDirPGI)\$(TargetName).lib</ImportLibrary> @@ -35,4 +35,4 @@ <Value>$(OutDirPGI)</Value> </BuildMacro> </ItemGroup> -</Project> \ No newline at end of file +</Project> diff --git a/PCbuild/pylauncher.vcxproj b/PCbuild/pylauncher.vcxproj --- a/PCbuild/pylauncher.vcxproj +++ b/PCbuild/pylauncher.vcxproj @@ -199,7 +199,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> + <EnableCOMDATFolding>false</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -216,7 +216,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> + <EnableCOMDATFolding>false</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -233,7 +233,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> + <EnableCOMDATFolding>false</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -250,7 +250,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> + <EnableCOMDATFolding>false</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -267,7 +267,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> + <EnableCOMDATFolding>false</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -284,7 +284,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> + <EnableCOMDATFolding>false</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -308,4 +308,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> diff --git a/PCbuild/pywlauncher.vcxproj b/PCbuild/pywlauncher.vcxproj --- a/PCbuild/pywlauncher.vcxproj +++ b/PCbuild/pywlauncher.vcxproj @@ -143,7 +143,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> + <EnableCOMDATFolding>false</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -160,7 +160,7 @@ </ClCompile> <Link> <GenerateDebugInformation>true</GenerateDebugInformation> - <EnableCOMDATFolding>true</EnableCOMDATFolding> + <EnableCOMDATFolding>false</EnableCOMDATFolding> <OptimizeReferences>true</OptimizeReferences> <IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries> <AdditionalDependencies>version.lib;%(AdditionalDependencies)</AdditionalDependencies> @@ -199,4 +199,4 @@ <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> </ImportGroup> -</Project> \ No newline at end of file +</Project> -- Repository URL: http://hg.python.org/cpython