Changeset 158272 in webkit


Ignore:
Timestamp:
Oct 30, 2013 9:05:40 AM (10 years ago)
Author:
alex.christensen@flexsim.com
Message:

Disabled JIT on Win64.
​https://bugs.webkit.org/show_bug.cgi?id=122472

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

Disabled building JITStubsMSVC64.

Source/WebKit:

  • WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:

Added missing 64-bit linker symbol.

Source/WTF:

  • wtf/Platform.h:

Disabled JIT on Win64.

Location:
trunk/Source
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/ChangeLog

    r158237 r158272  
     12013-10-30  Alex Christensen  <achristensen@webkit.org>
     2
     3        Disabled JIT on Win64.
     4        https://bugs.webkit.org/show_bug.cgi?id=122472
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
     9        Disabled building JITStubsMSVC64.
     10
    1112013-10-29  Michael Saboff  <msaboff@apple.com>
    212

  • trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj

    r157737 r158272  
    10731073    <MASM Include="..\jit\JITStubsMSVC64.asm">
    10741074      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|Win32'">true</ExcludedFromBuild>
     1075      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release_WinCairo|x64'">true</ExcludedFromBuild>
    10751076      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
     1077      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    10761078      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|Win32'">true</ExcludedFromBuild>
     1079      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
    10771080      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|Win32'">true</ExcludedFromBuild>
     1081      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug_WinCairo|x64'">true</ExcludedFromBuild>
    10781082      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
     1083      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
    10791084      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|Win32'">true</ExcludedFromBuild>
     1085      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='DebugSuffix|x64'">true</ExcludedFromBuild>
    10801086    </MASM>
    10811087  </ItemGroup>

  • trunk/Source/WTF/ChangeLog

    r158245 r158272  
     12013-10-30  Alex Christensen  <achristensen@webkit.org>
     2
     3        Disabled JIT on Win64.
     4        https://bugs.webkit.org/show_bug.cgi?id=122472
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        * wtf/Platform.h:
     9        Disabled JIT on Win64.
     10
    1112013-10-29  Andreas Kling  <akling@apple.com>
    212

  • trunk/Source/WTF/wtf/Platform.h

    r158231 r158272  
    688688#endif
    689689
    690 /* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms. */
     690/* The JIT is enabled by default on all x86, x86-64, ARM & MIPS platforms except Win64. */
    691691#if !defined(ENABLE_JIT) \
    692692    && (CPU(X86) || CPU(X86_64) || CPU(ARM) || CPU(ARM64) || CPU(MIPS)) \
    693693    && (OS(DARWIN) || !COMPILER(GCC) || GCC_VERSION_AT_LEAST(4, 1, 0)) \
    694694    && !OS(WINCE) \
    695     && !OS(QNX)
     695    && !OS(QNX) \
     696    && !(OS(WINDOWS) && CPU(X86_64))
    696697#define ENABLE_JIT 1
    697698#endif

  • trunk/Source/WebKit/ChangeLog

    r158137 r158272  
     12013-10-30  Alex Christensen  <achristensen@webkit.org>
     2
     3        Disabled JIT on Win64.
     4        https://bugs.webkit.org/show_bug.cgi?id=122472
     5
     6        Reviewed by Geoffrey Garen.
     7
     8        * WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in:
     9        Added missing 64-bit linker symbol.
     10
    1112013-10-28  Joseph Pecoraro  <pecoraro@apple.com>
    212

  • trunk/Source/WebKit/WebKit.vcxproj/WebKitExportGenerator/WebKitExports.def.in

    r157909 r158272  
    275275        symbolWithPointer(?setFantasyFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z, ?setFantasyFontFamily@Settings@WebCore@@QEAAXAEBVAtomicString@WTF@@W4UScriptCode@@@Z)
    276276        symbolWithPointer(?setFixedFontFamily@Settings@WebCore@@QAEXABVAtomicString@WTF@@W4UScriptCode@@@Z, ?setFixedFontFamily@Settings@WebCore@@QEAAXAEBVAtomicString@WTF@@W4UScriptCode@@@Z)
    277         symbolWithPointer(?setFontFallbackPrefersPictographs@Settings@WebCore@@QAEX_N@Z)
     277        symbolWithPointer(?setFontFallbackPrefersPictographs@Settings@WebCore@@QAEX_N@Z, ?setFontFallbackPrefersPictographs@Settings@WebCore@@QEAAX_N@Z)
    278278        symbolWithPointer(?setFooterHeight@FrameView@WebCore@@QAEXH@Z, ?setFooterHeight@FrameView@WebCore@@QEAAXH@Z)
    279279        symbolWithPointer(?setHeaderHeight@FrameView@WebCore@@QAEXH@Z, ?setHeaderHeight@FrameView@WebCore@@QEAAXH@Z)
Note: See TracChangeset for help on using the changeset viewer.