Changeset 152395 in webkit

Timestamp:

Jul 4, 2013 2:12:31 AM (11 years ago)

Author:

Patrick Gansterer

Message:

[CMake] Add generation of JITStubs for x86_64 MSVC
​https://bugs.webkit.org/show_bug.cgi?id=116666

Reviewed by Laszlo Gombos.

Also move the generation for ARM CPU into the CMakeLists.txt,
since it's compiler specific and not dedicated to Windows CE.

• CMakeLists.txt:
• PlatformWinCE.cmake: Removed.

Location:

trunk/Source/JavaScriptCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• PlatformWinCE.cmake (deleted)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -520 +520 @@
         assembler/MacroAssemblerARM.cpp
     )
+    if (MSVC AND ENABLE_JIT)
+        add_custom_command(
+            OUTPUT ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
+            MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/create_jit_stubs
+            DEPENDS ${JAVASCRIPTCORE_DIR}/jit/JITStubs.cpp
+            COMMAND ${PERL_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/create_jit_stubs --prefix=MSVC ${JAVASCRIPTCORE_DIR}/jit/JITStubs.cpp > ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
+            VERBATIM)
+
+        add_custom_command(
+            OUTPUT ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj
+            MAIN_DEPENDENCY ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
+            COMMAND armasm -nologo ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj
+            VERBATIM)
+
+        list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj)
+    endif ()
 elseif (WTF_CPU_MIPS)
 elseif (WTF_CPU_X86)
 elseif (WTF_CPU_X86_64)
+    if (MSVC AND ENABLE_JIT)
+        add_custom_command(
+            OUTPUT ${DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj
+            MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/jit/JITStubsMSVC64.asm
+            COMMAND ml64 -nologo -c -Fo ${DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj ${JAVASCRIPTCORE_DIR}/jit/JITStubsMSVC64.asm
+            VERBATIM)
+
+        list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj)
+    endif ()
 else ()
     message(FATAL_ERROR "Unknown CPU")

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2013-07-04  Patrick Gansterer  <paroga@webkit.org>
+
+        [CMake] Add generation of JITStubs for x86_64 MSVC
+        https://bugs.webkit.org/show_bug.cgi?id=116666
+
+        Reviewed by Laszlo Gombos.
+
+        Also move the generation for ARM CPU into the CMakeLists.txt,
+        since it's compiler specific and not dedicated to Windows CE.
+
+        * CMakeLists.txt:
+        * PlatformWinCE.cmake: Removed.
+
 2013-07-04  Patrick Gansterer  <paroga@webkit.org>