/SAFESEH should not be a common linker option

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

diff --git a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
index b7053908d6fe6675757b8ee970f4a542b1bda449..57b9ce643a7a44d513ede3ecb8eda679f631c87c 100755 (executable)
--- a/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcproj/testRegExp/testRegExp.vcproj
@@ -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"

diff --git a/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj b/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj
index c3e8a4b9ea65abd92392c6814fddb46dedcef5e8..d02d292fe88d489b23c588bd4dd21f9d5299a396 100644 (file)
--- a/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj
+++ b/Source/ThirdParty/ANGLE/src/libEGL/libEGL.vcproj
@@ -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"

diff --git a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj
index 3bc836399a1e8a82b1e7f02925cc26da67725610..d97d4e92c9813a2489c5d7154527f6bfdd628a78 100644 (file)
--- a/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj
+++ b/Source/ThirdParty/ANGLE/src/libGLESv2/libGLESv2.vcproj
@@ -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"

diff --git a/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj b/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj
index 4071d28fed01ccfa933091c7117f2a58401bfe00..255b4942824dcfe10ab6809fb3aacee582681d9b 100644 (file)
--- a/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj
+++ b/Source/ThirdParty/gtest/msvc/gtest_prod_test-md.vcproj
@@ -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"

diff --git a/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj b/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj
index 998c75808a1624e6744a2b217960c06e211faff5..8fe6f24d34cc7bac8ef1726345b114e35eb6c8a1 100644 (file)
--- a/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj
+++ b/Source/ThirdParty/gtest/msvc/gtest_prod_test.vcproj
@@ -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"

diff --git a/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj b/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj
index 1525939750d747c7b48ac4483869cf6765a6eaca..aeaefd035102142e09ac009ec38a80063a43cc0b 100644 (file)
--- a/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj
+++ b/Source/ThirdParty/gtest/msvc/gtest_unittest-md.vcproj
@@ -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"

diff --git a/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj b/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj
index 2b2d7434571048fa0537a884eba78b6887758161..56034690740cda63cea5ef1748b84358b0ea413e 100644 (file)
--- a/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj
+++ b/Source/ThirdParty/gtest/msvc/gtest_unittest.vcproj
@@ -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"

diff --git a/Tools/CLWrapper/CLWrapper.vcproj b/Tools/CLWrapper/CLWrapper.vcproj
index 844d72a7c570c0a9d7455e636462cecbc8a64f09..3563692b3370666d5eacb18482345d26788e16cc 100644 (file)
--- a/Tools/CLWrapper/CLWrapper.vcproj
+++ b/Tools/CLWrapper/CLWrapper.vcproj
@@ -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"

diff --git a/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj b/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj
index 72050b14b9d957f573facd5d5f5d02e3c6a4f4c1..de8a1db622cec1b828219f57d5d7a66f9f2610da 100644 (file)
--- a/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj
+++ b/Tools/DumpRenderTree/win/DumpRenderTreeLauncher.vcproj
@@ -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"

diff --git a/Tools/MIDLWrapper/MIDLWrapper.vcproj b/Tools/MIDLWrapper/MIDLWrapper.vcproj
index d9ab9f93f9085e6d8a4bcdef04f4c0e9fc07ca35..598f9ec68171179489cc9db852f3665c2b53aa98 100644 (file)
--- a/Tools/MIDLWrapper/MIDLWrapper.vcproj
+++ b/Tools/MIDLWrapper/MIDLWrapper.vcproj
@@ -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"

diff --git a/WebKitLibraries/ChangeLog b/WebKitLibraries/ChangeLog
index 81f460aaacb41bf9fa0307376c2ae6d29346c12e..5b3bc8911d999ce075c1b8326c77be7960c0995a 100644 (file)
--- a/WebKitLibraries/ChangeLog
+++ b/WebKitLibraries/ChangeLog
@@ -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.

diff --git a/WebKitLibraries/win/tools/vsprops/common.vsprops b/WebKitLibraries/win/tools/vsprops/common.vsprops
index 6a6a874e34c89a8e40029b9e06aa754fa87b144c..b1ef21c0c229bf31e36b5ec2f699873aa7b51f0d 100644 (file)
--- a/WebKitLibraries/win/tools/vsprops/common.vsprops
+++ b/WebKitLibraries/win/tools/vsprops/common.vsprops
@@ -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"