Title: [220841] releases/WebKitGTK/webkit-2.18/Source/_javascript_Core
- Revision
- 220841
- Author
- [email protected]
- Date
- 2017-08-17 00:47:02 -0700 (Thu, 17 Aug 2017)
Log Message
Merge r220791 - Fix JSCOnly ARM buildbots after r220047 and r220184
https://bugs.webkit.org/show_bug.cgi?id=174993
Reviewed by Carlos Alberto Lopez Perez.
* CMakeLists.txt: Generate only one backend on Linux to save build time.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.18/Source/_javascript_Core/CMakeLists.txt (220840 => 220841)
--- releases/WebKitGTK/webkit-2.18/Source/_javascript_Core/CMakeLists.txt 2017-08-17 07:45:01 UTC (rev 220840)
+++ releases/WebKitGTK/webkit-2.18/Source/_javascript_Core/CMakeLists.txt 2017-08-17 07:47:02 UTC (rev 220841)
@@ -1158,11 +1158,31 @@
${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Bytecodes.h
)
+if ((${CMAKE_SYSTEM_NAME} STREQUAL "Linux"))
+ if (WTF_CPU_X86)
+ set(OFFLINE_ASM_BACKEND "X86")
+ elseif (WTF_CPU_X86_64)
+ set(OFFLINE_ASM_BACKEND "X86_64")
+ elseif (WTF_CPU_ARM64)
+ set(OFFLINE_ASM_BACKEND "ARM64")
+ elseif (ARM_THUMB2_DETECTED)
+ set(OFFLINE_ASM_BACKEND "ARMv7")
+ elseif (ARM_TRADITIONAL_DETECTED)
+ set(OFFLINE_ASM_BACKEND "ARMv7_TRADITIONAL")
+ elseif (WTF_CPU_MIPS)
+ set(OFFLINE_ASM_BACKEND "MIPS")
+ endif ()
+
+ if (NOT ENABLE_JIT)
+ set(OFFLINE_ASM_BACKEND "C_LOOP")
+ endif ()
+endif ()
+
add_custom_command(
OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
MAIN_DEPENDENCY ${_javascript_CORE_DIR}/offlineasm/generate_offset_extractor.rb
DEPENDS ${LLINT_ASM} ${OFFLINE_ASM} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
- COMMAND ${RUBY_EXECUTABLE} ${_javascript_CORE_DIR}/offlineasm/generate_offset_extractor.rb -I${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${_javascript_CORE_DIR}/llint/LowLevelInterpreter.asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h
+ COMMAND ${RUBY_EXECUTABLE} ${_javascript_CORE_DIR}/offlineasm/generate_offset_extractor.rb -I${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${_javascript_CORE_DIR}/llint/LowLevelInterpreter.asm ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntDesiredOffsets.h ${OFFLINE_ASM_BACKEND}
VERBATIM)
# We add the header files directly to the ADD_EXECUTABLE call instead of setting the
Modified: releases/WebKitGTK/webkit-2.18/Source/_javascript_Core/ChangeLog (220840 => 220841)
--- releases/WebKitGTK/webkit-2.18/Source/_javascript_Core/ChangeLog 2017-08-17 07:45:01 UTC (rev 220840)
+++ releases/WebKitGTK/webkit-2.18/Source/_javascript_Core/ChangeLog 2017-08-17 07:47:02 UTC (rev 220841)
@@ -1,3 +1,12 @@
+2017-08-16 Csaba Osztrogonác <[email protected]>
+
+ Fix JSCOnly ARM buildbots after r220047 and r220184
+ https://bugs.webkit.org/show_bug.cgi?id=174993
+
+ Reviewed by Carlos Alberto Lopez Perez.
+
+ * CMakeLists.txt: Generate only one backend on Linux to save build time.
+
2017-08-15 Saam Barati <[email protected]>
Make VM::scratchBufferForSize thread safe
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
