Changeset 196019 in webkit


Ignore:
Timestamp:
Feb 2, 2016 11:07:03 AM (8 years ago)
Author:
peavo@outlook.com
Message:

[B3][Win64] Compile fixes.
​https://bugs.webkit.org/show_bug.cgi?id=153605

Reviewed by Filip Pizlo.

Fix remaining compile errors on Win64.

  • CMakeLists.txt:
  • b3/B3CFG.h:

(JSC::B3::CFG::newMap):

  • ftl/FTLJITCode.h:
Location:
trunk/Source/JavaScriptCore
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/CMakeLists.txt

    r196001 r196019  
    10721072
    10731073        llvm/InitializeLLVM.cpp
    1074         llvm/InitializeLLVMLinux.cpp
    1075         llvm/InitializeLLVMPOSIX.cpp
    10761074        llvm/LLVMAPI.cpp
    10771075    )
     1076    if (NOT WIN32)
     1077        list(APPEND JavaScriptCore_SOURCES
     1078            llvm/InitializeLLVMLinux.cpp
     1079            llvm/InitializeLLVMPOSIX.cpp
     1080        )
     1081    endif ()
    10781082endif ()
    10791083
    … …  
    13611365WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
    13621366
    1363 if (ENABLE_FTL_JIT)
     1367if (ENABLE_FTL_JIT AND NOT WIN32)
    13641368    if (NOT llvmForJSC_LIBRARIES)
    13651369        set(llvmForJSC_LIBRARIES ${LLVM_STATIC_LIBRARIES})

  • trunk/Source/JavaScriptCore/ChangeLog

    r196004 r196019  
     12016-02-02  Per Arne Vollan  <peavo@outlook.com>
     2
     3        [B3][Win64] Compile fixes.
     4        https://bugs.webkit.org/show_bug.cgi?id=153605
     5
     6        Reviewed by Filip Pizlo.
     7
     8        Fix remaining compile errors on Win64.
     9
     10        * CMakeLists.txt:
     11        * b3/B3CFG.h:
     12        (JSC::B3::CFG::newMap):
     13        * ftl/FTLJITCode.h:
     14
    1152016-02-01  Chris Dumez  <cdumez@apple.com>
    216

  • trunk/Source/JavaScriptCore/b3/B3CFG.h

    r193682 r196019  
    5353
    5454    template<typename T>
    55     Map<T> newMap() { return IndexMap<BasicBlock, T>(m_proc.size()); }
     55    Map<T> newMap() { return IndexMap<JSC::B3::BasicBlock, T>(m_proc.size()); }
    5656
    5757    SuccessorCollection<BasicBlock, BasicBlock::SuccessorList> successors(Node node) { return node->successorBlocks(); }

  • trunk/Source/JavaScriptCore/ftl/FTLJITCode.h

    r195865 r196019  
    4040#include <wtf/RefCountedArray.h>
    4141
     42#if !FTL_USES_B3
    4243#if OS(DARWIN)
    4344#define SECTION_NAME_PREFIX "__"
    … …  
    4950
    5051#define SECTION_NAME(NAME) (SECTION_NAME_PREFIX NAME)
     52#endif // !FTL_USES_B3
    5153
    5254namespace JSC {
Note: See TracChangeset for help on using the changeset viewer.