Changeset 259102 in webkit


Ignore:
Timestamp:
Mar 26, 2020 9:13:08 PM (4 years ago)
Author:
Fujii Hironori
Message:

[Win] lld-link: error: /manifestdependency: is not allowed in .drectve
​https://bugs.webkit.org/show_bug.cgi?id=204831

Reviewed by Ross Kirsling.

.:

  • Source/cmake/WebKitMacros.cmake (WEBKIT_EXECUTABLE): Added /manifestdependency linkder option if WIN32.

Source/JavaScriptCore:

  • 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:
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r259043 r259102  
     12020-03-26  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        [Win] lld-link: error: /manifestdependency: is not allowed in .drectve
     4        https://bugs.webkit.org/show_bug.cgi?id=204831
     5
     6        Reviewed by Ross Kirsling.
     7
     8        * Source/cmake/WebKitMacros.cmake (WEBKIT_EXECUTABLE): Added /manifestdependency linkder option if WIN32.
     9
    1102020-03-26  Commit Queue  <commit-queue@webkit.org>
    211

  • trunk/Source/JavaScriptCore/ChangeLog

    r259096 r259102  
     12020-03-26  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        [Win] lld-link: error: /manifestdependency: is not allowed in .drectve
     4        https://bugs.webkit.org/show_bug.cgi?id=204831
     5
     6        Reviewed by Ross Kirsling.
     7
     8        * shell/DLLLauncherMain.cpp: Removed /manifestdependency for Microsoft.VC80.CRT which seems leftover of Bug 116562 (r178530).
     9
    1102020-03-26  Ross Kirsling  <ross.kirsling@sony.com>
    211

  • trunk/Source/JavaScriptCore/shell/DLLLauncherMain.cpp

    r259043 r259102  
    3636#include <windows.h>
    3737
    38 #if defined _M_IX86
    39 #define PROCESSORARCHITECTURE "x86"
    40 #elif defined _M_IA64
    41 #define PROCESSORARCHITECTURE "ia64"
    42 #elif defined _M_X64
    43 #define PROCESSORARCHITECTURE "amd64"
    44 #else
    45 #define PROCESSORARCHITECTURE "*"
    46 #endif
    47 
    48 #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
    49 #if defined(_MSC_VER) && (_MSC_VER >= 1600) && !defined(WIN_CAIRO)
    50 #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.VC80.CRT' version='8.0.50727.6195' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='1fc8b3b9a1e18e3b' language='*'\"")
    51 #endif
    52 
    5338static void enableTerminationOnHeapCorruption()
    5439{

  • trunk/Source/cmake/WebKitMacros.cmake

    r259043 r259102  
    217217    if (${_target}_OUTPUT_NAME)
    218218        set_target_properties(${_target} PROPERTIES OUTPUT_NAME ${${_target}_OUTPUT_NAME})
     219    endif ()
     220    if (WIN32)
     221        if (WTF_CPU_X86)
     222            set(_processor_architecture "x86")
     223        elseif (WTF_CPU_X86_64)
     224            set(_processor_architecture "amd64")
     225        else ()
     226            set(_processor_architecture "*")
     227        endif ()
     228        target_link_options(${_target} PRIVATE "/manifestdependency:type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='${_processor_architecture}' publicKeyToken='6595b64144ccf1df' language='*'")
    219229    endif ()
    220230endmacro()

  • trunk/Tools/ChangeLog

    r259099 r259102  
     12020-03-26  Fujii Hironori  <Hironori.Fujii@sony.com>
     2
     3        [Win] lld-link: error: /manifestdependency: is not allowed in .drectve
     4        https://bugs.webkit.org/show_bug.cgi?id=204831
     5
     6        Reviewed by Ross Kirsling.
     7
     8        * TestWebKitAPI/win/main.cpp:
     9        * win/DLLLauncher/DLLLauncherMain.cpp:
     10
    1112020-03-24  Ryan Haddad  <ryanhaddad@apple.com>
    212

  • trunk/Tools/TestWebKitAPI/win/main.cpp

    r259043 r259102  
    2828#include <windows.h>
    2929
    30 #if defined _M_IX86
    31 #define PROCESSORARCHITECTURE "x86"
    32 #elif defined _M_IA64
    33 #define PROCESSORARCHITECTURE "ia64"
    34 #elif defined _M_X64
    35 #define PROCESSORARCHITECTURE "amd64"
    36 #else
    37 #define PROCESSORARCHITECTURE "*"
    38 #endif
    39 
    40 #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
    41 
    4230int main(int argc, char** argv)
    4331{

  • trunk/Tools/win/DLLLauncher/DLLLauncherMain.cpp

    r259043 r259102  
    3838using namespace std;
    3939
    40 #if defined _M_IX86
    41 #define PROCESSORARCHITECTURE "x86"
    42 #elif defined _M_IA64
    43 #define PROCESSORARCHITECTURE "ia64"
    44 #elif defined _M_X64
    45 #define PROCESSORARCHITECTURE "amd64"
    46 #else
    47 #define PROCESSORARCHITECTURE "*"
    48 #endif
    49 
    50 #pragma comment(linker, "/manifestdependency:\"type='win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='" PROCESSORARCHITECTURE "' publicKeyToken='6595b64144ccf1df' language='*'\"")
    51 
    5240static void enableTerminationOnHeapCorruption()
    5341{
Note: See TracChangeset for help on using the changeset viewer.