Title: [232293] trunk/Source/_javascript_Core
- Revision
- 232293
- Author
- msab...@apple.com
- Date
- 2018-05-30 09:09:01 -0700 (Wed, 30 May 2018)
Log Message
REGRESSION(r232212): Broke Win32 Builds
https://bugs.webkit.org/show_bug.cgi?id=186061
Reviewed by Yusuke Suzuki.
Changed Windows builds with the JIT disabled to generate and use LLIntAssembly.h
instead of LowLevelInterpreterWin.asm.
* CMakeLists.txt:
Modified Paths
Diff
Modified: trunk/Source/_javascript_Core/CMakeLists.txt (232292 => 232293)
--- trunk/Source/_javascript_Core/CMakeLists.txt 2018-05-30 15:47:41 UTC (rev 232292)
+++ trunk/Source/_javascript_Core/CMakeLists.txt 2018-05-30 16:09:01 UTC (rev 232293)
@@ -263,7 +263,7 @@
# LLIntOffsetsExtractor matches, no output is generated. To make this target consistent and avoid
# running this command for every build, we artificially update LLIntAssembly.h's mtime (using touch)
# after every asm.rb run.
-if (MSVC)
+if (MSVC AND ENABLE_JIT)
set(LLIntOutput LowLevelInterpreterWin.asm)
set(OFFLINE_ASM_ARGS --assembler=MASM)
else ()
@@ -283,7 +283,7 @@
# the .cpp files below is similar to the one in the previous comment. However, since these .cpp
# files are used to build _javascript_Core itself, we can just add LLIntAssembly.h to JSC_HEADERS
# since it is used in the add_library() call at the end of this file.
-if (MSVC)
+if (MSVC AND ENABLE_JIT)
enable_language(ASM_MASM)
if (CMAKE_SIZEOF_VOID_P EQUAL 4)
# Win32 needs /safeseh with assembly, but Win64 does not.
Modified: trunk/Source/_javascript_Core/ChangeLog (232292 => 232293)
--- trunk/Source/_javascript_Core/ChangeLog 2018-05-30 15:47:41 UTC (rev 232292)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-05-30 16:09:01 UTC (rev 232293)
@@ -1,3 +1,15 @@
+2018-05-30 Michael Saboff <msab...@apple.com>
+
+ REGRESSION(r232212): Broke Win32 Builds
+ https://bugs.webkit.org/show_bug.cgi?id=186061
+
+ Reviewed by Yusuke Suzuki.
+
+ Changed Windows builds with the JIT disabled to generate and use LLIntAssembly.h
+ instead of LowLevelInterpreterWin.asm.
+
+ * CMakeLists.txt:
+
2018-05-30 Dominik Infuehr <dinfu...@igalia.com>
[MIPS] Fix build on MIPS32r1
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
