<!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>[198320] releases/WebKitGTK/webkit-2.10/Source</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/198320">198320</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-17 00:44:29 -0700 (Thu, 17 Mar 2016)</dd>
</dl>

<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194518">r194518</a> - WebKit fails to build with musl libc library
https://bugs.webkit.org/show_bug.cgi?id=152625

Patch by Khem Raj &lt;raj.khem@gmail.com&gt; on 2016-01-03
Source/JavaScriptCore:

Reviewed by Daniel Bates.

Qualify isnan() calls with std namespace.

* runtime/Options.cpp:
(Option::operator==): Add std namespace qualifier.

Source/WebCore:

Reviewed by Daniel Bates and Alexey Proskuryakov.

malloc_trim is glibc specific API so guard it with __GLIBC__.

* platform/linux/MemoryPressureHandlerLinux.cpp:
(MemoryPressureHandler::platformReleaseMemory): Guard malloc_trim()
call with __GLIBC_.

Source/WTF:

Reviewed by Daniel Bates.

Disable ctype.h check for musl C library on Linux.
Enable backtrace on Linux when using glibc.
We don't have backtrace() implemented on non-glibc system
C libraries on Linux e.g. musl.

* wtf/DisallowCType.h: Check for __GLIBC__.
* wtf/Assertions.cpp:
(WTFGetBacktrace): Check if libc is glibc.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceJavaScriptCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceJavaScriptCoreruntimeOptionscpp">releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/Options.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWTFChangeLog">releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWTFwtfAssertionscpp">releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Assertions.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWTFwtfDisallowCTypeh">releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/DisallowCType.h</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebCoreplatformlinuxMemoryPressureHandlerLinuxcpp">releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog (198319 => 198320)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog        2016-03-17 07:43:52 UTC (rev 198319)
+++ releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/ChangeLog        2016-03-17 07:44:29 UTC (rev 198320)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-01-03  Khem Raj  &lt;raj.khem@gmail.com&gt;
+
+        WebKit fails to build with musl libc library
+        https://bugs.webkit.org/show_bug.cgi?id=152625
+
+        Reviewed by Daniel Bates.
+
+        Qualify isnan() calls with std namespace.
+
+        * runtime/Options.cpp:
+        (Option::operator==): Add std namespace qualifier.
+
</ins><span class="cx"> 2016-02-15  Mark Lam  &lt;mark.lam@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [ARMv7] stress/op_rshift.js and stress/op_urshift.js are failing.
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceJavaScriptCoreruntimeOptionscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/Options.cpp (198319 => 198320)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/Options.cpp        2016-03-17 07:43:52 UTC (rev 198319)
+++ releases/WebKitGTK/webkit-2.10/Source/JavaScriptCore/runtime/Options.cpp        2016-03-17 07:44:29 UTC (rev 198320)
</span><span class="lines">@@ -610,7 +610,7 @@
</span><span class="cx">     case Options::Type::unsignedType:
</span><span class="cx">         return m_entry.unsignedVal == other.m_entry.unsignedVal;
</span><span class="cx">     case Options::Type::doubleType:
</span><del>-        return (m_entry.doubleVal == other.m_entry.doubleVal) || (isnan(m_entry.doubleVal) &amp;&amp; isnan(other.m_entry.doubleVal));
</del><ins>+        return (m_entry.doubleVal == other.m_entry.doubleVal) || (std::isnan(m_entry.doubleVal) &amp;&amp; std::isnan(other.m_entry.doubleVal));
</ins><span class="cx">     case Options::Type::int32Type:
</span><span class="cx">         return m_entry.int32Val == other.m_entry.int32Val;
</span><span class="cx">     case Options::Type::optionRangeType:
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWTFChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog (198319 => 198320)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog        2016-03-17 07:43:52 UTC (rev 198319)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/ChangeLog        2016-03-17 07:44:29 UTC (rev 198320)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-01-03  Khem Raj  &lt;raj.khem@gmail.com&gt;
+
+        WebKit fails to build with musl libc library
+        https://bugs.webkit.org/show_bug.cgi?id=152625
+
+        Reviewed by Daniel Bates.
+
+        Disable ctype.h check for musl C library on Linux.
+        Enable backtrace on Linux when using glibc.
+        We don't have backtrace() implemented on non-glibc system
+        C libraries on Linux e.g. musl.
+
+        * wtf/DisallowCType.h: Check for __GLIBC__.
+        * wtf/Assertions.cpp:
+        (WTFGetBacktrace): Check if libc is glibc.
+
</ins><span class="cx"> 2016-02-08  Filip Pizlo  &lt;fpizlo@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Make sure that locking code that relies on module boundaries for compiler fences uses NEVER_INLINE
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWTFwtfAssertionscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Assertions.cpp (198319 => 198320)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Assertions.cpp        2016-03-17 07:43:52 UTC (rev 198319)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/Assertions.cpp        2016-03-17 07:44:29 UTC (rev 198320)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> #include &lt;unistd.h&gt;
</span><span class="cx"> #endif
</span><span class="cx"> 
</span><del>-#if OS(DARWIN) || (OS(LINUX) &amp;&amp; !defined(__UCLIBC__))
</del><ins>+#if OS(DARWIN) || (OS(LINUX) &amp;&amp; defined(__GLIBC__) &amp;&amp; !defined(__UCLIBC__))
</ins><span class="cx"> #include &lt;cxxabi.h&gt;
</span><span class="cx"> #include &lt;dlfcn.h&gt;
</span><span class="cx"> #include &lt;execinfo.h&gt;
</span><span class="lines">@@ -225,7 +225,7 @@
</span><span class="cx"> 
</span><span class="cx"> void WTFGetBacktrace(void** stack, int* size)
</span><span class="cx"> {
</span><del>-#if OS(DARWIN) || (OS(LINUX) &amp;&amp; !defined(__UCLIBC__))
</del><ins>+#if OS(DARWIN) || (OS(LINUX) &amp;&amp; defined(__GLIBC__) &amp;&amp; !defined(__UCLIBC__))
</ins><span class="cx">     *size = backtrace(stack, *size);
</span><span class="cx"> #elif OS(WINDOWS)
</span><span class="cx">     // The CaptureStackBackTrace function is available in XP, but it is not defined
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWTFwtfDisallowCTypeh"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/DisallowCType.h (198319 => 198320)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/DisallowCType.h        2016-03-17 07:43:52 UTC (rev 198319)
+++ releases/WebKitGTK/webkit-2.10/Source/WTF/wtf/DisallowCType.h        2016-03-17 07:44:29 UTC (rev 198320)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> // are used from wx headers. On GTK+ for Mac many GTK+ files include &lt;libintl.h&gt;
</span><span class="cx"> // or &lt;glib/gi18n-lib.h&gt;, which in turn include &lt;xlocale/_ctype.h&gt; which uses
</span><span class="cx"> // isacii(). 
</span><del>-#if !(OS(DARWIN) &amp;&amp; PLATFORM(GTK)) &amp;&amp; !PLATFORM(EFL) &amp;&amp; !defined(_LIBCPP_VERSION)
</del><ins>+#if !(OS(DARWIN) &amp;&amp; PLATFORM(GTK)) &amp;&amp; !PLATFORM(EFL) &amp;&amp; !defined(_LIBCPP_VERSION) &amp;&amp; defined(__GLIBC__)
</ins><span class="cx"> 
</span><span class="cx"> #include &lt;ctype.h&gt;
</span><span class="cx"> 
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog (198319 => 198320)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2016-03-17 07:43:52 UTC (rev 198319)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/ChangeLog        2016-03-17 07:44:29 UTC (rev 198320)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-01-03  Khem Raj  &lt;raj.khem@gmail.com&gt;
+
+        WebKit fails to build with musl libc library
+        https://bugs.webkit.org/show_bug.cgi?id=152625
+
+        Reviewed by Daniel Bates and Alexey Proskuryakov.
+
+        malloc_trim is glibc specific API so guard it with __GLIBC__.
+
+        * platform/linux/MemoryPressureHandlerLinux.cpp:
+        (MemoryPressureHandler::platformReleaseMemory): Guard malloc_trim()
+        call with __GLIBC_.
+
</ins><span class="cx"> 2016-03-10  Carlos Garcia Campos  &lt;cgarcia@igalia.com&gt;
</span><span class="cx"> 
</span><span class="cx">         [GTK] Scrollbars are broken once again with current GTK+ master
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebCoreplatformlinuxMemoryPressureHandlerLinuxcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp (198319 => 198320)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp        2016-03-17 07:43:52 UTC (rev 198319)
+++ releases/WebKitGTK/webkit-2.10/Source/WebCore/platform/linux/MemoryPressureHandlerLinux.cpp        2016-03-17 07:44:29 UTC (rev 198320)
</span><span class="lines">@@ -201,8 +201,10 @@
</span><span class="cx"> 
</span><span class="cx"> void MemoryPressureHandler::platformReleaseMemory(Critical)
</span><span class="cx"> {
</span><ins>+#ifdef __GLIBC__
</ins><span class="cx">     ReliefLogger log(&quot;Run malloc_trim&quot;);
</span><span class="cx">     malloc_trim(0);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void MemoryPressureHandler::ReliefLogger::platformLog()
</span></span></pre>
</div>
</div>

</body>
</html>