<!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>[196749] trunk</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/196749">196749</a></dd>
<dt>Author</dt> <dd>mcatanzaro@igalia.com</dd>
<dt>Date</dt> <dd>2016-02-18 00:29:51 -0800 (Thu, 18 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[CMake] Remove LLVM support
https://bugs.webkit.org/show_bug.cgi?id=154370
Reviewed by Csaba Osztrogonác.
After switching all CMake ports to B3, this was only needed for the LLVM disassembler, which
has been removed from JSC. Feel free to bring this back if restoring the LLVM disassembler,
but for the time being this is dead code.
* Source/cmake/FindLLVM.cmake: Removed.
* Source/cmake/OptionsCommon.cmake:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeOptionsCommoncmake">trunk/Source/cmake/OptionsCommon.cmake</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourcecmakeFindLLVMcmake">trunk/Source/cmake/FindLLVM.cmake</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (196748 => 196749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2016-02-18 08:28:44 UTC (rev 196748)
+++ trunk/ChangeLog 2016-02-18 08:29:51 UTC (rev 196749)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-02-18 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [CMake] Remove LLVM support
+ https://bugs.webkit.org/show_bug.cgi?id=154370
+
+ Reviewed by Csaba Osztrogonác.
+
+ After switching all CMake ports to B3, this was only needed for the LLVM disassembler, which
+ has been removed from JSC. Feel free to bring this back if restoring the LLVM disassembler,
+ but for the time being this is dead code.
+
+ * Source/cmake/FindLLVM.cmake: Removed.
+ * Source/cmake/OptionsCommon.cmake:
+
</ins><span class="cx"> 2016-02-18 Joonghun Park <jh718.park@samsung.com>
</span><span class="cx">
</span><span class="cx"> [CMake] Remove meaningless conditional statements in CMakeLists.txt
</span></span></pre></div>
<a id="trunkSourcecmakeFindLLVMcmake"></a>
<div class="delfile"><h4>Deleted: trunk/Source/cmake/FindLLVM.cmake (196748 => 196749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/FindLLVM.cmake 2016-02-18 08:28:44 UTC (rev 196748)
+++ trunk/Source/cmake/FindLLVM.cmake 2016-02-18 08:29:51 UTC (rev 196749)
</span><span class="lines">@@ -1,49 +0,0 @@
</span><del>-#
-# Check if the llvm-config gives us the path for the llvm libs.
-#
-# The following variables are set:
-# LLVM_CONFIG_EXE
-# LLVM_VERSION
-# LLVM_INCLUDE_DIRS - include directories for the llvm headers.
-# LLVM_STATIC_LIBRARIES - list of paths for the static llvm libraries.
-
-
-foreach (_program_name llvm-config llvm-config-3.7 llvm-config-3.6 llvm-config-3.5)
- find_program(LLVM_CONFIG_EXE NAMES ${_program_name})
- if (LLVM_CONFIG_EXE)
- execute_process(COMMAND ${LLVM_CONFIG_EXE} --version OUTPUT_VARIABLE LLVM_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE)
- if ("${LLVM_VERSION}" VERSION_LESS "${LLVM_FIND_VERSION}")
- unset(LLVM_CONFIG_EXE CACHE)
- else ()
- break ()
- endif ()
- endif ()
-endforeach ()
-
-execute_process(COMMAND ${LLVM_CONFIG_EXE} --includedir OUTPUT_VARIABLE LLVM_INCLUDE_DIRS OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${LLVM_CONFIG_EXE} --libfiles OUTPUT_VARIABLE LLVM_STATIC_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${LLVM_CONFIG_EXE} --system-libs OUTPUT_VARIABLE LLVM_SYSTEM_LIBRARIES OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${LLVM_CONFIG_EXE} --libdir OUTPUT_VARIABLE LLVM_LIBS_DIRECTORY OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${LLVM_CONFIG_EXE} --libs OUTPUT_VARIABLE LLVM_LIBS OUTPUT_STRIP_TRAILING_WHITESPACE)
-execute_process(COMMAND ${LLVM_CONFIG_EXE} --ldflags OUTPUT_VARIABLE LLVM_LDFLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
-
-# Depending on how llvm was built, we could have either a global .so file when built using autotools,
-# or multiple .so files for each static library when built using CMake. So, we set the LLVM_LIBS_DIRECTORY
-# variable here accordingly for each case.
-# We need to build the soname manually in any case, since there's currently no way to get it from llvm-config.
-set(LLVM_SONAME "LLVM-${LLVM_VERSION}")
-if (EXISTS "${LLVM_LIBS_DIRECTORY}/lib${LLVM_SONAME}.so")
- set(LLVM_LIBRARIES "${LLVM_LDFLAGS} -l${LLVM_SONAME}")
-else ()
- set(LLVM_LIBRARIES "${LLVM_LDFLAGS} ${LLVM_LIBS}")
-endif ()
-
-# convert the list of paths into a cmake list
-separate_arguments(LLVM_STATIC_LIBRARIES)
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args(LLVM
- REQUIRED_VARS LLVM_VERSION LLVM_INCLUDE_DIRS LLVM_LIBRARIES LLVM_STATIC_LIBRARIES
- VERSION_VAR LLVM_VERSION)
-
-mark_as_advanced(LLVM_VERSION LLVM_INCLUDE_DIRS LLVM_LIBRARIES LLVM_STATIC_LIBRARIES)
</del></span></pre></div>
<a id="trunkSourcecmakeOptionsCommoncmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsCommon.cmake (196748 => 196749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsCommon.cmake 2016-02-18 08:28:44 UTC (rev 196748)
+++ trunk/Source/cmake/OptionsCommon.cmake 2016-02-18 08:29:51 UTC (rev 196749)
</span><span class="lines">@@ -124,11 +124,6 @@
</span><span class="cx"> set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined ${CMAKE_SHARED_LINKER_FLAGS}")
</span><span class="cx"> endif ()
</span><span class="cx">
</span><del>-if (USE_LLVM_DISASSEMBLER)
- find_package(LLVM REQUIRED)
- SET_AND_EXPOSE_TO_BUILD(HAVE_LLVM TRUE)
-endif ()
-
</del><span class="cx"> # Enable the usage of OpenMP.
</span><span class="cx"> # - At this moment, OpenMP is only used as an alternative implementation
</span><span class="cx"> # to native threads for the parallelization of the SVG filters.
</span></span></pre>
</div>
</div>
</body>
</html>