/SAFESEH should not be a common linker option
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Aug 2012 23:40:17 +0000 (23:40 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Aug 2012 23:40:17 +0000 (23:40 +0000)
https://bugs.webkit.org/show_bug.cgi?id=89372

Patch by Alex Christensen <alex.christensen@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)

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@125622 268f45cc-cd09-0410-ab3c-d52691b4dbfc

12 files changed:
Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj
Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj
Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj
Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj
Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj
Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj
Tools/CLWrapper/CLWrapper.vcproj
Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj
Tools/MIDLWrapper/MIDLWrapper.vcproj
WebKitLibraries/ChangeLog
WebKitLibraries/win/tools/vsprops/common.vsprops

index b705390..57b9ce6 100755 (executable)
@@ -50,6 +50,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
index c3e8a4b..d02d292 100644 (file)
@@ -67,6 +67,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
                                LinkIncremental="2"
                                ModuleDefinitionFile="libEGL.def"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
                                LinkIncremental="1"
                                ModuleDefinitionFile="libEGL.def"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
                                LinkIncremental="2"
                                ModuleDefinitionFile="libEGL.def"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                AdditionalDependencies="d3d9.lib dxguid.lib dwmapi.lib"
                                LinkIncremental="1"
                                ModuleDefinitionFile="libEGL.def"
index 3bc8363..d97d4e9 100644 (file)
@@ -67,6 +67,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
                                LinkIncremental="2"
                                ModuleDefinitionFile="libGLESv2.def"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
                                LinkIncremental="1"
                                IgnoreAllDefaultLibraries="false"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
                                LinkIncremental="2"
                                ModuleDefinitionFile="libGLESv2.def"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                AdditionalDependencies="d3d9.lib D3dx9.lib d3dcompiler.lib"
                                LinkIncremental="1"
                                IgnoreAllDefaultLibraries="false"
index 4071d28..255b494 100644 (file)
@@ -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"
index 998c758..8fe6f24 100644 (file)
@@ -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"
index 1525939..aeaefd0 100644 (file)
@@ -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"
index 2b2d743..5603469 100644 (file)
@@ -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"
index 844d72a..3563692 100644 (file)
@@ -60,6 +60,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                OutputFile="$(OutDir)\cl.exe"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                OutputFile="$(OutDir)\cl.exe"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
index 72050b1..de8a1db 100644 (file)
@@ -50,6 +50,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                        />
                        <Tool
                                Name="VCALinkTool"
index d9ab9f9..598f9ec 100644 (file)
@@ -60,6 +60,7 @@
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                OutputFile="$(OutDir)\midl.exe"
                                LinkIncremental="2"
                                GenerateDebugInformation="true"
                        />
                        <Tool
                                Name="VCLinkerTool"
+                               AdditionalOptions="/SAFESEH"
                                OutputFile="$(OutDir)\midl.exe"
                                LinkIncremental="1"
                                GenerateDebugInformation="true"
index 81f460a..5b3bc89 100644 (file)
@@ -1,3 +1,13 @@
+2012-08-14  Alex Christensen  <alex.christensen@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_fong@apple.com>
 
         Enable CSS Sticky Position on Windows.
index 6a6a874..b1ef21c 100644 (file)
@@ -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"