<!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>[163085] 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/163085">163085</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-01-30 09:33:53 -0800 (Thu, 30 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Only disable -ftree-dce optimization when compiling with GCC
https://bugs.webkit.org/show_bug.cgi?id=127911
Reviewed by Carlos Garcia Campos.
.:
* Source/autotools/SetupAutomake.m4: Define the COMPILER_GCC and COMPILER_CLANG Automake macros.
These can be used when compiler-specific flags have to be used. The latter one is not actually needed
at the moment, but is added for the sake of completeness.
Source/JavaScriptCore:
* GNUmakefile.am: Only disable the -ftree-dce optimization when using the GCC compiler.
Some Clang versions/configurations don't support the flag.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreGNUmakefileam">trunk/Source/JavaScriptCore/GNUmakefile.am</a></li>
<li><a href="#trunkSourceautotoolsSetupAutomakem4">trunk/Source/autotools/SetupAutomake.m4</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (163084 => 163085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-30 17:17:06 UTC (rev 163084)
+++ trunk/ChangeLog 2014-01-30 17:33:53 UTC (rev 163085)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-01-30 Zan Dobersek <zdobersek@igalia.com>
+
+ [GTK] Only disable -ftree-dce optimization when compiling with GCC
+ https://bugs.webkit.org/show_bug.cgi?id=127911
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Source/autotools/SetupAutomake.m4: Define the COMPILER_GCC and COMPILER_CLANG Automake macros.
+ These can be used when compiler-specific flags have to be used. The latter one is not actually needed
+ at the moment, but is added for the sake of completeness.
+
</ins><span class="cx"> 2014-01-30 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL] Fix the regression caused by the jsCStack branch merge
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (163084 => 163085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-01-30 17:17:06 UTC (rev 163084)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-01-30 17:33:53 UTC (rev 163085)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2014-01-30 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><ins>+ [GTK] Only disable -ftree-dce optimization when compiling with GCC
+ https://bugs.webkit.org/show_bug.cgi?id=127911
+
+ Reviewed by Carlos Garcia Campos.
+
+ * GNUmakefile.am: Only disable the -ftree-dce optimization when using the GCC compiler.
+ Some Clang versions/configurations don't support the flag.
+
+2014-01-30 Zan Dobersek <zdobersek@igalia.com>
+
</ins><span class="cx"> [GTK] Disable optimizations for JSC that turned out malignant after jsCStack branch merge
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=127909
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreGNUmakefileam"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/GNUmakefile.am (163084 => 163085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/GNUmakefile.am 2014-01-30 17:17:06 UTC (rev 163084)
+++ trunk/Source/JavaScriptCore/GNUmakefile.am 2014-01-30 17:33:53 UTC (rev 163085)
</span><span class="lines">@@ -44,10 +44,6 @@
</span><span class="cx"> $(global_cppflags) \
</span><span class="cx"> $(javascriptcore_cppflags)
</span><span class="cx">
</span><del>-# FIXME: the -fomit-frame-pointer and -ftree-dce optimizations are disabled after they've been causing
-# trouble with the merged jsCStack code. The former is required due to otherwise incorrectly compiled
-# operationCallEval function, while the second is required when using GCC 4.8 but not when using GCC 4.7,
-# possibly due to a bug in that compiler. See bugs #127777 and #127909 for more information.
</del><span class="cx"> javascriptcore_cppflags += \
</span><span class="cx"> -I$(srcdir)/Source \
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore \
</span><span class="lines">@@ -74,10 +70,20 @@
</span><span class="cx"> -I$(srcdir)/Source/JavaScriptCore/yarr \
</span><span class="cx"> -I$(top_builddir)/DerivedSources/JavaScriptCore \
</span><span class="cx"> -I$(srcdir)/Source/WTF \
</span><del>- -fno-omit-frame-pointer \
- -fno-tree-dce \
</del><span class="cx"> $(LLVM_CFLAGS)
</span><span class="cx">
</span><ins>+# FIXME: the -fomit-frame-pointer and -ftree-dce optimizations are disabled after they've been causing
+# trouble with the merged jsCStack code. The former is required due to otherwise incorrectly compiled
+# operationCallEval function, while the latter is required when using GCC 4.8. See bugs #127777 and
+# #127909 for more information.
+javascriptcore_cppflags += \
+ -fno-omit-frame-pointer
+
+if COMPILER_GCC
+javascriptcore_cppflags += \
+ -fno-tree-dce
+endif
+
</ins><span class="cx"> javascriptcore_cflags += \
</span><span class="cx"> $(global_cflags) \
</span><span class="cx"> $(GLIB_CFLAGS) \
</span></span></pre></div>
<a id="trunkSourceautotoolsSetupAutomakem4"></a>
<div class="modfile"><h4>Modified: trunk/Source/autotools/SetupAutomake.m4 (163084 => 163085)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/autotools/SetupAutomake.m4 2014-01-30 17:17:06 UTC (rev 163084)
+++ trunk/Source/autotools/SetupAutomake.m4 2014-01-30 17:33:53 UTC (rev 163085)
</span><span class="lines">@@ -22,6 +22,9 @@
</span><span class="cx"> AM_CONDITIONAL([OS_DARWIN],[test "$os_darwin" = "yes"])
</span><span class="cx"> AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"])
</span><span class="cx">
</span><ins>+AM_CONDITIONAL([COMPILER_GCC],[test "$c_compiler" = "gcc" && test "$cxx_compiler" = "g++"])
+AM_CONDITIONAL([COMPILER_CLANG],[test "$c_compiler" = "clang" && test "$cxx_compiler" = "clang++"])
+
</ins><span class="cx"> # Target conditionals.
</span><span class="cx"> AM_CONDITIONAL([TARGET_X11], [test "$enable_x11_target" = "yes"])
</span><span class="cx"> AM_CONDITIONAL([TARGET_WAYLAND], [test "$enable_wayland_target" = "yes"])
</span></span></pre>
</div>
</div>
</body>
</html>