<!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>[175465] 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/175465">175465</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-02 23:53:11 -0800 (Sun, 02 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Fix the build of FTL JIT
https://bugs.webkit.org/show_bug.cgi?id=138298
Patch by Akos Kiss <akiss@inf.u-szeged.hu> on 2014-11-02
Reviewed by Carlos Garcia Campos.
.:
* Source/cmake/OptionsGTK.cmake:
Remove the need for the LIBCXXABI package.
Tools:
* gtk/jhbuild-optional.modules:
Bump up LLVM version to 3.5.0 release and apply patches.
* gtk/patches/llvm-elf-add-stackmaps.patch:
Added. Adds .llvm_stackmaps section to ELF files. Backported from LLVM
trunk.
* gtk/patches/llvm-elf-fix-x86_64-fdecfiencoding.patch:
Added. Ensures that PC-relative relocations in EH frames are not
truncated to 32 bits on x86_64.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourcecmakeOptionsGTKcmake">trunk/Source/cmake/OptionsGTK.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsgtkjhbuildoptionalmodules">trunk/Tools/gtk/jhbuild-optional.modules</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkToolsgtkpatchesllvmelfaddstackmapspatch">trunk/Tools/gtk/patches/llvm-elf-add-stackmaps.patch</a></li>
<li><a href="#trunkToolsgtkpatchesllvmelffixx86_64fdecfiencodingpatch">trunk/Tools/gtk/patches/llvm-elf-fix-x86_64-fdecfiencoding.patch</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (175464 => 175465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-11-02 22:47:30 UTC (rev 175464)
+++ trunk/ChangeLog 2014-11-03 07:53:11 UTC (rev 175465)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2014-11-02 Akos Kiss <akiss@inf.u-szeged.hu>
+
+ [GTK] Fix the build of FTL JIT
+ https://bugs.webkit.org/show_bug.cgi?id=138298
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/cmake/OptionsGTK.cmake:
+ Remove the need for the LIBCXXABI package.
+
</ins><span class="cx"> 2014-11-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION(CMake): Make it possible to build without introspection
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsGTKcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsGTK.cmake (175464 => 175465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsGTK.cmake 2014-11-02 22:47:30 UTC (rev 175464)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-11-03 07:53:11 UTC (rev 175465)
</span><span class="lines">@@ -314,7 +314,6 @@
</span><span class="cx">
</span><span class="cx"> if (ENABLE_FTL_JIT)
</span><span class="cx"> find_package(LLVM REQUIRED)
</span><del>- find_package(LIBCXXABI REQUIRED)
</del><span class="cx"> set(HAVE_LLVM ON)
</span><span class="cx"> endif ()
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (175464 => 175465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-11-02 22:47:30 UTC (rev 175464)
+++ trunk/Tools/ChangeLog 2014-11-03 07:53:11 UTC (rev 175465)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2014-11-02 Akos Kiss <akiss@inf.u-szeged.hu>
+
+ [GTK] Fix the build of FTL JIT
+ https://bugs.webkit.org/show_bug.cgi?id=138298
+
+ Reviewed by Carlos Garcia Campos.
+
+ * gtk/jhbuild-optional.modules:
+ Bump up LLVM version to 3.5.0 release and apply patches.
+ * gtk/patches/llvm-elf-add-stackmaps.patch:
+ Added. Adds .llvm_stackmaps section to ELF files. Backported from LLVM
+ trunk.
+ * gtk/patches/llvm-elf-fix-x86_64-fdecfiencoding.patch:
+ Added. Ensures that PC-relative relocations in EH frames are not
+ truncated to 32 bits on x86_64.
+
</ins><span class="cx"> 2014-10-31 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> No way to specify target os or architecture when using the --no-copy option with run-jsc-stress-tests
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildoptionalmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild-optional.modules (175464 => 175465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild-optional.modules 2014-11-02 22:47:30 UTC (rev 175464)
+++ trunk/Tools/gtk/jhbuild-optional.modules 2014-11-03 07:53:11 UTC (rev 175465)
</span><span class="lines">@@ -9,8 +9,8 @@
</span><span class="cx">
</span><span class="cx"> <repository type="tarball" name="ftp.gnome.org"
</span><span class="cx"> href="http://ftp.gnome.org"/>
</span><del>- <repository type="svn" name="llvm.org"
- href="http://llvm.org/svn/llvm-project/llvm/"/>
</del><ins>+ <repository type="tarball" name="llvm.org"
+ href="http://llvm.org"/>
</ins><span class="cx">
</span><span class="cx"> <autotools id="libsecret" autogen-sh="configure">
</span><span class="cx"> <branch repo="ftp.gnome.org"
</span><span class="lines">@@ -44,9 +44,14 @@
</span><span class="cx"> </dependencies>
</span><span class="cx"> </autotools>
</span><span class="cx">
</span><del>- <autotools id="llvm" autogenargs="--enable-optimized --disable-terminfo --disable-zlib">
- <branch repo="llvm.org" module="trunk" checkoutdir="llvm" version="r206311"
- revision="206311"/>
</del><ins>+ <autotools id="llvm"
+ autogenargs="--enable-optimized --disable-terminfo --disable-zlib --enable-targets=host --disable-backtraces --disable-crash-overrides --disable-expensive-checks --disable-debug-runtime --disable-assertions">
+ <branch repo="llvm.org"
+ module="/releases/3.5.0/llvm-3.5.0.src.tar.xz" version="3.5.0" checkoutdir="llvm-3.5.0"
+ hash="sha256:28e199f368ef0a4666708f31c7991ad3bcc3a578342b0306526dd35f07595c03">
+ <patch file="llvm-elf-fix-x86_64-fdecfiencoding.patch" strip="1"/>
+ <patch file="llvm-elf-add-stackmaps.patch" strip="1"/>
+ </branch>
</ins><span class="cx"> </autotools>
</span><span class="cx">
</span><span class="cx"> </moduleset>
</span></span></pre></div>
<a id="trunkToolsgtkpatchesllvmelfaddstackmapspatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/gtk/patches/llvm-elf-add-stackmaps.patch (0 => 175465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/llvm-elf-add-stackmaps.patch (rev 0)
+++ trunk/Tools/gtk/patches/llvm-elf-add-stackmaps.patch 2014-11-03 07:53:11 UTC (rev 175465)
</span><span class="lines">@@ -0,0 +1,46 @@
</span><ins>+commit ec9de4677ac61f2164d7c80cae5da0008189efa3
+Author: Philip Reames <listmail@philipreames.com>
+Date: Fri Aug 1 18:47:09 2014 +0000
+
+ Add support for StackMap section for ELF/Linux systems
+
+ This patch adds code to emits the StackMap section on ELF systems. This section is required to support llvm.experimental.stackmap and llvm.experimental.patchpoint intrinsics.
+
+ Reviewers: ributzka, echristo
+
+ Differential Revision: http://reviews.llvm.org/D4574
+
+
+
+ git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@214538 91177308-0d34-0410-b5e6-96231b3b80d8
+
+diff --git a/lib/MC/MCObjectFileInfo.cpp b/lib/MC/MCObjectFileInfo.cpp
+index df5787c..da707d8 100644
+--- a/lib/MC/MCObjectFileInfo.cpp
++++ b/lib/MC/MCObjectFileInfo.cpp
+@@ -583,6 +583,12 @@ void MCObjectFileInfo::InitELFMCObjectFileInfo(Triple T) {
+ DwarfAddrSection =
+ Ctx->getELFSection(".debug_addr", ELF::SHT_PROGBITS, 0,
+ SectionKind::getMetadata());
++
++ StackMapSection =
++ Ctx->getELFSection(".llvm_stackmaps", ELF::SHT_PROGBITS,
++ ELF::SHF_ALLOC,
++ SectionKind::getMetadata());
++
+ }
+
+
+diff --git a/lib/Target/X86/X86AsmPrinter.cpp b/lib/Target/X86/X86AsmPrinter.cpp
+index 3c22e88..fc0d408 100644
+--- a/lib/Target/X86/X86AsmPrinter.cpp
++++ b/lib/Target/X86/X86AsmPrinter.cpp
+@@ -736,6 +736,8 @@ void X86AsmPrinter::EmitEndOfAsmFile(Module &M) {
+ }
+ Stubs.clear();
+ }
++
++ SM.serializeToStackMapSection();
+ }
+ }
+
</ins></span></pre></div>
<a id="trunkToolsgtkpatchesllvmelffixx86_64fdecfiencodingpatch"></a>
<div class="addfile"><h4>Added: trunk/Tools/gtk/patches/llvm-elf-fix-x86_64-fdecfiencoding.patch (0 => 175465)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/patches/llvm-elf-fix-x86_64-fdecfiencoding.patch (rev 0)
+++ trunk/Tools/gtk/patches/llvm-elf-fix-x86_64-fdecfiencoding.patch 2014-11-03 07:53:11 UTC (rev 175465)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+diff -ru llvm-3.5.0/lib/MC/MCObjectFileInfo.cpp llvm-3.5.0.patched/lib/MC/MCObjectFileInfo.cpp
+--- llvm-3.5.0/lib/MC/MCObjectFileInfo.cpp 2014-06-25 14:41:52.000000000 +0200
++++ llvm-3.5.0.patched/lib/MC/MCObjectFileInfo.cpp 2014-11-02 11:58:39.410521253 +0100
+@@ -274,6 +274,9 @@
+ case Triple::mips64el:
+ FDECFIEncoding = dwarf::DW_EH_PE_sdata8;
+ break;
++ case Triple::x86_64:
++ FDECFIEncoding = dwarf::DW_EH_PE_pcrel;
++ break;
+ default:
+ FDECFIEncoding = dwarf::DW_EH_PE_pcrel | dwarf::DW_EH_PE_sdata4;
+ break;
</ins></span></pre>
</div>
</div>
</body>
</html>