<!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>[199495] releases/WebKitGTK/webkit-2.12/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/199495">199495</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-13 08:53:55 -0700 (Wed, 13 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/199458">r199458</a> - Fix build in glibc-based BSD systems
https://bugs.webkit.org/show_bug.cgi?id=156533
Reviewed by Carlos Garcia Campos.
Change the order of the #elif conditionals so glibc-based BSD
systems (e.g. Debian GNU/kFreeBSD) use the code inside the
OS(FREEBSD) blocks.
* heap/MachineStackMarker.cpp:
(JSC::MachineThreads::Thread::Registers::stackPointer):
(JSC::MachineThreads::Thread::Registers::framePointer):
(JSC::MachineThreads::Thread::Registers::instructionPointer):
(JSC::MachineThreads::Thread::Registers::llintPC):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit212SourceJavaScriptCoreheapMachineStackMarkercpp">releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/heap/MachineStackMarker.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog (199494 => 199495)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-04-13 15:53:03 UTC (rev 199494)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog 2016-04-13 15:53:55 UTC (rev 199495)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-04-13 Alberto Garcia <berto@igalia.com>
+
+ Fix build in glibc-based BSD systems
+ https://bugs.webkit.org/show_bug.cgi?id=156533
+
+ Reviewed by Carlos Garcia Campos.
+
+ Change the order of the #elif conditionals so glibc-based BSD
+ systems (e.g. Debian GNU/kFreeBSD) use the code inside the
+ OS(FREEBSD) blocks.
+
+ * heap/MachineStackMarker.cpp:
+ (JSC::MachineThreads::Thread::Registers::stackPointer):
+ (JSC::MachineThreads::Thread::Registers::framePointer):
+ (JSC::MachineThreads::Thread::Registers::instructionPointer):
+ (JSC::MachineThreads::Thread::Registers::llintPC):
+
</ins><span class="cx"> 2016-04-01 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> [JSC] Missing PATH_MAX definition
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit212SourceJavaScriptCoreheapMachineStackMarkercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/heap/MachineStackMarker.cpp (199494 => 199495)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2016-04-13 15:53:03 UTC (rev 199494)
+++ releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/heap/MachineStackMarker.cpp 2016-04-13 15:53:55 UTC (rev 199495)
</span><span class="lines">@@ -550,34 +550,34 @@
</span><span class="cx">
</span><span class="cx"> #elif USE(PTHREADS)
</span><span class="cx">
</span><del>-#if defined(__GLIBC__) && ENABLE(JIT)
</del><ins>+#if OS(FREEBSD) && ENABLE(JIT)
</ins><span class="cx">
</span><span class="cx"> #if CPU(X86)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esp);
</ins><span class="cx"> #elif CPU(X86_64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RSP]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rsp);
</ins><span class="cx"> #elif CPU(ARM)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_sp);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_SP]);
</ins><span class="cx"> #elif CPU(ARM64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.sp);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_sp);
</ins><span class="cx"> #elif CPU(MIPS)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[29]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[29]);
</ins><span class="cx"> #else
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#elif OS(FREEBSD) && ENABLE(JIT)
</del><ins>+#elif defined(__GLIBC__) && ENABLE(JIT)
</ins><span class="cx">
</span><span class="cx"> #if CPU(X86)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esp);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESP]);
</ins><span class="cx"> #elif CPU(X86_64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rsp);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RSP]);
</ins><span class="cx"> #elif CPU(ARM)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_SP]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_sp);
</ins><span class="cx"> #elif CPU(ARM64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_sp);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.sp);
</ins><span class="cx"> #elif CPU(MIPS)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[29]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[29]);
</ins><span class="cx"> #else
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="lines">@@ -649,35 +649,35 @@
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#elif defined(__GLIBC__)
</del><ins>+#elif OS(FREEBSD)
</ins><span class="cx">
</span><del>-// The following sequence depends on glibc's sys/ucontext.h.
</del><span class="cx"> #if CPU(X86)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EBP]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_ebp);
</ins><span class="cx"> #elif CPU(X86_64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RBP]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rbp);
</ins><span class="cx"> #elif CPU(ARM)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_fp);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_FP]);
</ins><span class="cx"> #elif CPU(ARM64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.regs[29]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[29]);
</ins><span class="cx"> #elif CPU(MIPS)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[30]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[30]);
</ins><span class="cx"> #else
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#elif OS(FREEBSD)
</del><ins>+#elif defined(__GLIBC__)
</ins><span class="cx">
</span><ins>+// The following sequence depends on glibc's sys/ucontext.h.
</ins><span class="cx"> #if CPU(X86)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_ebp);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EBP]);
</ins><span class="cx"> #elif CPU(X86_64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rbp);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RBP]);
</ins><span class="cx"> #elif CPU(ARM)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_FP]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_fp);
</ins><span class="cx"> #elif CPU(ARM64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[29]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.regs[29]);
</ins><span class="cx"> #elif CPU(MIPS)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[30]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[30]);
</ins><span class="cx"> #else
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="lines">@@ -731,35 +731,35 @@
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#elif defined(__GLIBC__)
</del><ins>+#elif OS(FREEBSD)
</ins><span class="cx">
</span><del>-// The following sequence depends on glibc's sys/ucontext.h.
</del><span class="cx"> #if CPU(X86)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EIP]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_eip);
</ins><span class="cx"> #elif CPU(X86_64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RIP]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rip);
</ins><span class="cx"> #elif CPU(ARM)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_pc);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_PC]);
</ins><span class="cx"> #elif CPU(ARM64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.pc);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_elr);
</ins><span class="cx"> #elif CPU(MIPS)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.pc);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_pc);
</ins><span class="cx"> #else
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#elif OS(FREEBSD)
</del><ins>+#elif defined(__GLIBC__)
</ins><span class="cx">
</span><ins>+// The following sequence depends on glibc's sys/ucontext.h.
</ins><span class="cx"> #if CPU(X86)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_eip);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_EIP]);
</ins><span class="cx"> #elif CPU(X86_64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_rip);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_RIP]);
</ins><span class="cx"> #elif CPU(ARM)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_PC]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_pc);
</ins><span class="cx"> #elif CPU(ARM64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_elr);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.pc);
</ins><span class="cx"> #elif CPU(MIPS)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_pc);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.pc);
</ins><span class="cx"> #else
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="lines">@@ -822,35 +822,35 @@
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#elif defined(__GLIBC__)
</del><ins>+#elif OS(FREEBSD)
</ins><span class="cx">
</span><del>-// The following sequence depends on glibc's sys/ucontext.h.
</del><span class="cx"> #if CPU(X86)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESI]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esi);
</ins><span class="cx"> #elif CPU(X86_64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_R8]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_r8);
</ins><span class="cx"> #elif CPU(ARM)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_r8);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_R8]);
</ins><span class="cx"> #elif CPU(ARM64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.regs[4]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[4]);
</ins><span class="cx"> #elif CPU(MIPS)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[12]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[12]);
</ins><span class="cx"> #else
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#elif OS(FREEBSD)
</del><ins>+#elif defined(__GLIBC__)
</ins><span class="cx">
</span><ins>+// The following sequence depends on glibc's sys/ucontext.h.
</ins><span class="cx"> #if CPU(X86)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_esi);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_ESI]);
</ins><span class="cx"> #elif CPU(X86_64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_r8);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[REG_R8]);
</ins><span class="cx"> #elif CPU(ARM)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.__gregs[_REG_R8]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.arm_r8);
</ins><span class="cx"> #elif CPU(ARM64)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_gpregs.gp_x[4]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.regs[4]);
</ins><span class="cx"> #elif CPU(MIPS)
</span><del>- return reinterpret_cast<void*>((uintptr_t) regs.machineContext.mc_regs[12]);
</del><ins>+ return reinterpret_cast<void*>((uintptr_t) regs.machineContext.gregs[12]);
</ins><span class="cx"> #else
</span><span class="cx"> #error Unknown Architecture
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>