[webkit-changes] [125622] trunk

[commit-queue]

Title: [125622] trunk

Revision

125622

Author

commit-qu...@webkit.org

Date

2012-08-14 16:40:17 -0700 (Tue, 14 Aug 2012)

Log Message

/SAFESEH should not be a common linker option
https://bugs.webkit.org/show_bug.cgi?id=89372

Patch by Alex Christensen <alex.christen...@flexsim.com> on 2012-08-14
Reviewed by Darin Adler.

* win/tools/vsprops/common.vsprops:
removed /SAFESEH as a default option for the linker (doesn't work for x64)

Modified Paths

• trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExp.vcproj
• trunk/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj
• trunk/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj
• trunk/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj
• trunk/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj
• trunk/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj
• trunk/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj
• trunk/Tools/CLWrapper/CLWrapper.vcproj
• trunk/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj
• trunk/Tools/MIDLWrapper/MIDLWrapper.vcproj
• trunk/WebKitLibraries/ChangeLog
• trunk/WebKitLibraries/win/tools/vsprops/common.vsprops

Diff

Modified: trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExp.vcproj (125621 => 125622)

--- trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExp.vcproj	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/Source/_javascript_Core/_javascript_Core.vcproj/testRegExp/testRegExp.vcproj	2012-08-14 23:40:17 UTC (rev 125622)
@@ -50,6 +50,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -111,6 +112,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -172,6 +174,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -233,6 +236,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -295,6 +299,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -356,6 +361,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -417,6 +423,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: trunk/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj (125621 => 125622)

--- trunk/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj	2012-08-14 23:40:17 UTC (rev 125622)
@@ -67,6 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
 				LinkIncremental="2"
 				ModuleDefinitionFile="libEGL.def"
@@ -148,6 +149,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
 				LinkIncremental="1"
 				ModuleDefinitionFile="libEGL.def"
@@ -232,6 +234,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
 				LinkIncremental="2"
 				ModuleDefinitionFile="libEGL.def"
@@ -314,6 +317,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
 				LinkIncremental="1"
 				ModuleDefinitionFile="libEGL.def"

Modified: trunk/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj (125621 => 125622)

--- trunk/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj	2012-08-14 23:40:17 UTC (rev 125622)
@@ -67,6 +67,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
 				LinkIncremental="2"
 				ModuleDefinitionFile="libGLESv2.def"
@@ -147,6 +148,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="false"
@@ -231,6 +233,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
 				LinkIncremental="2"
 				ModuleDefinitionFile="libGLESv2.def"
@@ -312,6 +315,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
 				LinkIncremental="1"
 				IgnoreAllDefaultLibraries="false"

Modified: trunk/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj (125621 => 125622)

--- trunk/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj	2012-08-14 23:40:17 UTC (rev 125622)
@@ -31,6 +31,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_prod_test.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -76,6 +77,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_prod_test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"

Modified: trunk/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj (125621 => 125622)

--- trunk/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj	2012-08-14 23:40:17 UTC (rev 125622)
@@ -31,6 +31,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_prod_test.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -76,6 +77,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_prod_test.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"

Modified: trunk/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj (125621 => 125622)

--- trunk/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj	2012-08-14 23:40:17 UTC (rev 125622)
@@ -31,6 +31,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_unittest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -76,6 +77,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_unittest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"

Modified: trunk/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj (125621 => 125622)

--- trunk/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj	2012-08-14 23:40:17 UTC (rev 125622)
@@ -31,6 +31,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_unittest.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="TRUE"
@@ -76,6 +77,7 @@
 				Name="VCCustomBuildTool"/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)/gtest_unittest.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="TRUE"

Modified: trunk/Tools/CLWrapper/CLWrapper.vcproj (125621 => 125622)

--- trunk/Tools/CLWrapper/CLWrapper.vcproj	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/Tools/CLWrapper/CLWrapper.vcproj	2012-08-14 23:40:17 UTC (rev 125622)
@@ -60,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)\cl.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -134,6 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)\cl.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

Modified: trunk/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj (125621 => 125622)

--- trunk/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj	2012-08-14 23:40:17 UTC (rev 125622)
@@ -50,6 +50,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -111,6 +112,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -172,6 +174,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -233,6 +236,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -295,6 +299,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -356,6 +361,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 			/>
 			<Tool
 				Name="VCALinkTool"

Modified: trunk/Tools/MIDLWrapper/MIDLWrapper.vcproj (125621 => 125622)

--- trunk/Tools/MIDLWrapper/MIDLWrapper.vcproj	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/Tools/MIDLWrapper/MIDLWrapper.vcproj	2012-08-14 23:40:17 UTC (rev 125622)
@@ -60,6 +60,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)\midl.exe"
 				LinkIncremental="2"
 				GenerateDebugInformation="true"
@@ -134,6 +135,7 @@
 			/>
 			<Tool
 				Name="VCLinkerTool"
+				AdditionalOptions="/SAFESEH"
 				OutputFile="$(OutDir)\midl.exe"
 				LinkIncremental="1"
 				GenerateDebugInformation="true"

Modified: trunk/WebKitLibraries/ChangeLog (125621 => 125622)

--- trunk/WebKitLibraries/ChangeLog	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/WebKitLibraries/ChangeLog	2012-08-14 23:40:17 UTC (rev 125622)
@@ -1,3 +1,13 @@
+2012-08-14  Alex Christensen  <alex.christen...@flexsim.com>
+
+        /SAFESEH should not be a common linker option
+        https://bugs.webkit.org/show_bug.cgi?id=89372
+
+        Reviewed by Darin Adler.
+
+        * win/tools/vsprops/common.vsprops:
+        removed /SAFESEH as a default option for the linker (doesn't work for x64)
+
 2012-08-13  Roger Fong  <roger_f...@apple.com>
 
         Enable CSS Sticky Position on Windows.

Modified: trunk/WebKitLibraries/win/tools/vsprops/common.vsprops (125621 => 125622)

--- trunk/WebKitLibraries/win/tools/vsprops/common.vsprops	2012-08-14 23:28:23 UTC (rev 125621)
+++ trunk/WebKitLibraries/win/tools/vsprops/common.vsprops	2012-08-14 23:40:17 UTC (rev 125622)
@@ -25,7 +25,7 @@
 	<Tool
 		Name="VCLinkerTool"
 		LinkLibraryDependencies="false"
-		AdditionalOptions="/SAFESEH /FIXED:NO /dynamicbase /ignore:4221"
+		AdditionalOptions="/FIXED:NO /dynamicbase /ignore:4221"
 		OutputFile="$(OutDir)\$(ProjectName)$(WebKitConfigSuffix).exe"
 		AdditionalLibraryDirectories="&quot;$(ConfigurationBuildDir)\lib&quot;;&quot;$(WebKitLibrariesDir)\lib&quot;"
 		GenerateDebugInformation="true"

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes