<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172754] trunk/Source/JavaScriptCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172754">172754</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-08-19 10:36:54 -0700 (Tue, 19 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] Generate LLInt assembly correctly on Windows.
https://bugs.webkit.org/show_bug.cgi?id=135888
Patch by Alex Christensen <achristensen@webkit.org> on 2014-08-19
Reviewed by Oliver Hunt.
* CMakeLists.txt:
Generate LowLevelInterpreterWin.asm instead of LLIntAssembly.h on Windows like the existing build system.
* PlatformWin.cmake:
Don't build JSGlobalObjectInspectorController.cpp on Windows.
* offlineasm/x86.rb:
Detect non-cygwin ruby installations correctly.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorePlatformWincmake">trunk/Source/JavaScriptCore/PlatformWin.cmake</a></li>
<li><a href="#trunkSourceJavaScriptCoreofflineasmx86rb">trunk/Source/JavaScriptCore/offlineasm/x86.rb</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (172753 => 172754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2014-08-19 17:04:45 UTC (rev 172753)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2014-08-19 17:36:54 UTC (rev 172754)
</span><span class="lines">@@ -669,21 +669,40 @@
</span><span class="cx"> # LLIntOffsetsExtractor matches, no output is generated. To make this target consistent and avoid
</span><span class="cx"> # running this command for every build, we artificially update LLIntAssembly.h's mtime (using touch)
</span><span class="cx"> # after every asm.rb run.
</span><ins>+if (MSVC)
+ set(LLIntOutput LowLevelInterpreterWin.asm)
+else ()
+ set(LLIntOutput LLIntAssembly.h)
+endif ()
+
</ins><span class="cx"> add_custom_command(
</span><del>- OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
</del><ins>+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${LLIntOutput}
</ins><span class="cx"> MAIN_DEPENDENCY ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb
</span><span class="cx"> DEPENDS LLIntOffsetsExtractor ${LLINT_ASM} ${OFFLINE_ASM} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InitBytecodes.asm
</span><del>- COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb -I${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntOffsetsExtractor> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
- COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
</del><ins>+ COMMAND ${RUBY_EXECUTABLE} ${JAVASCRIPTCORE_DIR}/offlineasm/asm.rb -I${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/ ${JAVASCRIPTCORE_DIR}/llint/LowLevelInterpreter.asm $<TARGET_FILE:LLIntOffsetsExtractor> ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${LLIntOutput}
+ COMMAND ${CMAKE_COMMAND} -E touch_nocreate ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/${LLIntOutput}
</ins><span class="cx"> VERBATIM)
</span><span class="cx">
</span><span class="cx"> # The explanation for not making LLIntAssembly.h part of the OBJECT_DEPENDS property of some of
</span><span class="cx"> # the .cpp files below is similar to the one in the previous comment. However, since these .cpp
</span><span class="cx"> # files are used to build JavaScriptCore itself, we can just add LLIntAssembly.h to JSC_HEADERS
</span><span class="cx"> # since it is used in the add_library() call at the end of this file.
</span><del>-list(APPEND JavaScriptCore_HEADERS
- ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
-)
</del><ins>+if (MSVC)
+ list(APPEND JavaScriptCore_SOURCES
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.asm
+ )
+ # Win32 needs /safeseh with assembly, but Win64 does not.
+ if (CMAKE_SIZEOF_VOID_P EQUAL 4)
+ set_source_files_properties(${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LowLevelInterpreterWin.asm
+ PROPERTIES COMPILE_FLAGS "/safeseh"
+ )
+ endif ()
+else ()
+ list(APPEND JavaScriptCore_HEADERS
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/LLIntAssembly.h
+ )
+endif ()
+
</ins><span class="cx"> list(APPEND JavaScriptCore_SOURCES
</span><span class="cx"> llint/LLIntCLoop.cpp
</span><span class="cx"> llint/LLIntData.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (172753 => 172754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-08-19 17:04:45 UTC (rev 172753)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-08-19 17:36:54 UTC (rev 172754)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-08-19 Alex Christensen <achristensen@webkit.org>
+
+ [CMake] Generate LLInt assembly correctly on Windows.
+ https://bugs.webkit.org/show_bug.cgi?id=135888
+
+ Reviewed by Oliver Hunt.
+
+ * CMakeLists.txt:
+ Generate LowLevelInterpreterWin.asm instead of LLIntAssembly.h on Windows like the existing build system.
+ * PlatformWin.cmake:
+ Don't build JSGlobalObjectInspectorController.cpp on Windows.
+ * offlineasm/x86.rb:
+ Detect non-cygwin ruby installations correctly.
+
</ins><span class="cx"> 2014-08-19 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(r163179): It broke the build on ARM Thumb2 with GCC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorePlatformWincmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/PlatformWin.cmake (172753 => 172754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/PlatformWin.cmake 2014-08-19 17:04:45 UTC (rev 172753)
+++ trunk/Source/JavaScriptCore/PlatformWin.cmake 2014-08-19 17:36:54 UTC (rev 172754)
</span><span class="lines">@@ -22,4 +22,8 @@
</span><span class="cx"> COMMAND ${PYTHON_EXECUTABLE} ${TOOLS_DIR}/Scripts/generate-win32-export-forwards ${WTF_LIBRARY_LOCATION} ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/forwarded-exports.cpp
</span><span class="cx"> VERBATIM)
</span><span class="cx"> list(APPEND JavaScriptCore_SOURCES ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/forwarded-exports.cpp)
</span><del>-endif ()
</del><span class="cx">\ No newline at end of file
</span><ins>+endif ()
+
+list(REMOVE_ITEM JavaScriptCore_SOURCES
+ inspector/JSGlobalObjectInspectorController.cpp
+)
</ins></span></pre></div>
<a id="trunkSourceJavaScriptCoreofflineasmx86rb"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/offlineasm/x86.rb (172753 => 172754)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/offlineasm/x86.rb 2014-08-19 17:04:45 UTC (rev 172753)
+++ trunk/Source/JavaScriptCore/offlineasm/x86.rb 2014-08-19 17:36:54 UTC (rev 172754)
</span><span class="lines">@@ -55,7 +55,7 @@
</span><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def isWindows
</span><del>- RUBY_PLATFORM =~ /cygwin/i
</del><ins>+ ENV['OS'] == 'Windows_NT'
</ins><span class="cx"> end
</span><span class="cx">
</span><span class="cx"> def isGCC
</span></span></pre>
</div>
</div>
</body>
</html>