Title: [259035] trunk
- Revision
- 259035
- Author
- hironori.fu...@sony.com
- Date
- 2020-03-25 23:43:11 -0700 (Wed, 25 Mar 2020)
Log Message
[Win] lld-link: error: /manifestdependency: is not allowed in .drectve
https://bugs.webkit.org/show_bug.cgi?id=204831
Reviewed by Ross Kirsling.
.:
clang-cl doesn't support #pragma comment(linker, "/manifestdependency ..").
Use an linker option instead.
* Source/cmake/WebKitMacros.cmake (WEBKIT_EXECUTABLE): Added -manifestdependency linkder option if WIN32.
Source/_javascript_Core:
* shell/DLLLauncherMain.cpp: Removed /manifestdependency for Microsoft.VC80.CRT which seems leftover of Bug 116562 (r178530).
Tools:
* TestWebKitAPI/win/main.cpp:
* win/DLLLauncher/DLLLauncherMain.cpp:
Modified Paths
Diff
Modified: trunk/ChangeLog (259034 => 259035)
--- trunk/ChangeLog 2020-03-26 06:26:51 UTC (rev 259034)
+++ trunk/ChangeLog 2020-03-26 06:43:11 UTC (rev 259035)
@@ -1,3 +1,15 @@
+2020-03-25 Fujii Hironori <hironori.fu...@sony.com>
+
+ [Win] lld-link: error: /manifestdependency: is not allowed in .drectve
+ https://bugs.webkit.org/show_bug.cgi?id=204831
+
+ Reviewed by Ross Kirsling.
+
+ clang-cl doesn't support #pragma comment(linker, "/manifestdependency ..").
+ Use an linker option instead.
+
+ * Source/cmake/WebKitMacros.cmake (WEBKIT_EXECUTABLE): Added -manifestdependency linkder option if WIN32.
+
2020-03-23 Michael Catanzaro <mcatanz...@gnome.org>
[GTK] Allow distributors to brand user agent
Modified: trunk/Source/_javascript_Core/ChangeLog (259034 => 259035)
--- trunk/Source/_javascript_Core/ChangeLog 2020-03-26 06:26:51 UTC (rev 259034)
+++ trunk/Source/_javascript_Core/ChangeLog 2020-03-26 06:43:11 UTC (rev 259035)
@@ -1,3 +1,12 @@
+2020-03-25 Fujii Hironori <hironori.fu...@sony.com>
+
+ [Win] lld-link: error: /manifestdependency: is not allowed in .drectve
+ https://bugs.webkit.org/show_bug.cgi?id=204831
+
+ Reviewed by Ross Kirsling.
+
+ * shell/DLLLauncherMain.cpp: Removed /manifestdependency for Microsoft.VC80.CRT which seems leftover of Bug 116562 (r178530).
+
2020-03-25 Alexey Shvayka <shvaikal...@gmail.com>
RegExp.prototype[@@replace] relies on globals and doesn't perform ToLength
Modified: trunk/Source/_javascript_Core/shell/DLLLauncherMain.cpp (259034 => 259035)
--- trunk/Source/_javascript_Core/shell/DLLLauncherMain.cpp 2020-03-26 06:26:51 UTC (rev 259034)
+++ trunk/Source/_javascript_Core/shell/DLLLauncherMain.cpp 2020-03-26 06:43:11 UTC (rev 259035)
@@ -35,21 +35,6 @@
#include <vector>
#include <windows.h>
-#if defined _M_IX86
-#define PROCESSORARCHITECTURE "x86"
-#elif defined _M_IA64
-#define PROCESSORARCHITECTURE "ia64"
-#elif defined _M_X64
-#define PROCESSORARCHITECTURE "amd64"
-#else
-#define PROCESSORARCHITECTURE "*"
-#endif
-
-#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
-#if defined(_MSC_VER) && (_MSC_VER >= 1600) && !defined(WIN_CAIRO)
-#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.6195' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='1fc8b3b9a1e18e3b' language='*'\"")
-#endif
-
static void enableTerminationOnHeapCorruption()
{
HEAP_INFORMATION_CLASS heapEnableTerminationOnCorruption = static_cast<HEAP_INFORMATION_CLASS>(1);
Modified: trunk/Source/cmake/WebKitMacros.cmake (259034 => 259035)
--- trunk/Source/cmake/WebKitMacros.cmake 2020-03-26 06:26:51 UTC (rev 259034)
+++ trunk/Source/cmake/WebKitMacros.cmake 2020-03-26 06:43:11 UTC (rev 259035)
@@ -217,6 +217,16 @@
if (${_target}_OUTPUT_NAME)
set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${${_target}_OUTPUT_NAME})
endif ()
+ if (WIN32)
+ if (WTF_CPU_X86)
+ set(_processor_architecture "x86")
+ elseif (WTF_CPU_X86_64)
+ set(_processor_architecture "amd64")
+ else ()
+ set(_processor_architecture "*")
+ endif ()
+ target_link_options(${_target} PRIVATE "-manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='${_processor_architecture}'")
+ endif ()
endmacro()
macro(WEBKIT_WRAP_EXECUTABLE _target)
Modified: trunk/Tools/ChangeLog (259034 => 259035)
--- trunk/Tools/ChangeLog 2020-03-26 06:26:51 UTC (rev 259034)
+++ trunk/Tools/ChangeLog 2020-03-26 06:43:11 UTC (rev 259035)
@@ -1,3 +1,13 @@
+2020-03-25 Fujii Hironori <hironori.fu...@sony.com>
+
+ [Win] lld-link: error: /manifestdependency: is not allowed in .drectve
+ https://bugs.webkit.org/show_bug.cgi?id=204831
+
+ Reviewed by Ross Kirsling.
+
+ * TestWebKitAPI/win/main.cpp:
+ * win/DLLLauncher/DLLLauncherMain.cpp:
+
2020-03-25 Alexey Shvayka <shvaikal...@gmail.com>
Invalid numeric and named references should be early syntax errors
Modified: trunk/Tools/TestWebKitAPI/win/main.cpp (259034 => 259035)
--- trunk/Tools/TestWebKitAPI/win/main.cpp 2020-03-26 06:26:51 UTC (rev 259034)
+++ trunk/Tools/TestWebKitAPI/win/main.cpp 2020-03-26 06:43:11 UTC (rev 259035)
@@ -27,18 +27,6 @@
#include "TestsController.h"
#include <windows.h>
-#if defined _M_IX86
-#define PROCESSORARCHITECTURE "x86"
-#elif defined _M_IA64
-#define PROCESSORARCHITECTURE "ia64"
-#elif defined _M_X64
-#define PROCESSORARCHITECTURE "amd64"
-#else
-#define PROCESSORARCHITECTURE "*"
-#endif
-
-#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
-
int main(int argc, char** argv)
{
// Cygwin calls ::SetErrorMode(SEM_FAILCRITICALERRORS), which we will inherit. This is bad for
Modified: trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp (259034 => 259035)
--- trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2020-03-26 06:26:51 UTC (rev 259034)
+++ trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp 2020-03-26 06:43:11 UTC (rev 259035)
@@ -37,18 +37,6 @@
using namespace std;
-#if defined _M_IX86
-#define PROCESSORARCHITECTURE "x86"
-#elif defined _M_IA64
-#define PROCESSORARCHITECTURE "ia64"
-#elif defined _M_X64
-#define PROCESSORARCHITECTURE "amd64"
-#else
-#define PROCESSORARCHITECTURE "*"
-#endif
-
-#pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
-
static void enableTerminationOnHeapCorruption()
{
HEAP_INFORMATION_CLASS heapEnableTerminationOnCorruption = static_cast<HEAP_INFORMATION_CLASS>(1);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
