Title: [152395] trunk/Source/_javascript_Core
- Revision
- 152395
- Author
- par...@webkit.org
- Date
- 2013-07-04 02:12:31 -0700 (Thu, 04 Jul 2013)
Log 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.
Modified Paths
Removed Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (152394 => 152395)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2013-07-04 09:05:05 UTC (rev 152394)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2013-07-04 09:12:31 UTC (rev 152395)
@@ -519,9 +519,34 @@
assembler/ARMv7Assembler.cpp
assembler/MacroAssemblerARM.cpp
)
+ if (MSVC AND ENABLE_JIT)
+ add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
+ MAIN_DEPENDENCY ${_javascript_CORE_DIR}/create_jit_stubs
+ DEPENDS ${_javascript_CORE_DIR}/jit/JITStubs.cpp
+ COMMAND ${PERL_EXECUTABLE} ${_javascript_CORE_DIR}/create_jit_stubs --prefix=MSVC ${_javascript_CORE_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 _javascript_Core_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 ${_javascript_CORE_DIR}/jit/JITStubsMSVC64.asm
+ COMMAND ml64 -nologo -c -Fo ${DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj ${_javascript_CORE_DIR}/jit/JITStubsMSVC64.asm
+ VERBATIM)
+
+ list(APPEND _javascript_Core_SOURCES ${DERIVED_SOURCES_DIR}/JITStubsMSVC64.obj)
+ endif ()
else ()
message(FATAL_ERROR "Unknown CPU")
endif ()
Modified: trunk/Source/_javascript_Core/ChangeLog (152394 => 152395)
--- trunk/Source/_javascript_Core/ChangeLog 2013-07-04 09:05:05 UTC (rev 152394)
+++ trunk/Source/_javascript_Core/ChangeLog 2013-07-04 09:12:31 UTC (rev 152395)
@@ -1,5 +1,18 @@
2013-07-04 Patrick Gansterer <par...@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 <par...@webkit.org>
+
[CMake] Add STATICALLY_LINKED_WITH_WTF to _javascript_Core project
https://bugs.webkit.org/show_bug.cgi?id=118120
Deleted: trunk/Source/_javascript_Core/PlatformWinCE.cmake (152394 => 152395)
--- trunk/Source/_javascript_Core/PlatformWinCE.cmake 2013-07-04 09:05:05 UTC (rev 152394)
+++ trunk/Source/_javascript_Core/PlatformWinCE.cmake 2013-07-04 09:12:31 UTC (rev 152395)
@@ -1,16 +0,0 @@
-if (ENABLE_JIT AND WTF_CPU_ARM)
- add_custom_command(
- OUTPUT ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.asm
- MAIN_DEPENDENCY ${_javascript_CORE_DIR}/create_jit_stubs
- DEPENDS ${_javascript_CORE_DIR}/jit/JITStubs.cpp
- COMMAND ${PERL_EXECUTABLE} ${_javascript_CORE_DIR}/create_jit_stubs --prefix=MSVC ${_javascript_CORE_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 _javascript_Core_SOURCES ${DERIVED_SOURCES_DIR}/GeneratedJITStubs.obj)
-endif ()
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
