Title: [165442] releases/WebKitGTK/webkit-2.4
- Revision
- 165442
- Author
- [email protected]
- Date
- 2014-03-11 03:56:51 -0700 (Tue, 11 Mar 2014)
Log Message
Merge r163085 - [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/_javascript_Core:
* GNUmakefile.am: Only disable the -ftree-dce optimization when using the GCC compiler.
Some Clang versions/configurations don't support the flag.
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/ChangeLog (165441 => 165442)
--- releases/WebKitGTK/webkit-2.4/ChangeLog 2014-03-11 10:45:56 UTC (rev 165441)
+++ releases/WebKitGTK/webkit-2.4/ChangeLog 2014-03-11 10:56:51 UTC (rev 165442)
@@ -1,3 +1,14 @@
+2014-01-30 Zan Dobersek <[email protected]>
+
+ [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.
+
2014-03-03 Carlos Garcia Campos <[email protected]>
Unreviewed. Update NEWS and Versions.m4 for 2.3.91 release.
Modified: releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/ChangeLog (165441 => 165442)
--- releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/ChangeLog 2014-03-11 10:45:56 UTC (rev 165441)
+++ releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/ChangeLog 2014-03-11 10:56:51 UTC (rev 165442)
@@ -1,5 +1,15 @@
2014-01-30 Zan Dobersek <[email protected]>
+ [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 <[email protected]>
+
[GTK] Disable optimizations for JSC that turned out malignant after jsCStack branch merge
https://bugs.webkit.org/show_bug.cgi?id=127909
Modified: releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/GNUmakefile.am (165441 => 165442)
--- releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/GNUmakefile.am 2014-03-11 10:45:56 UTC (rev 165441)
+++ releases/WebKitGTK/webkit-2.4/Source/_javascript_Core/GNUmakefile.am 2014-03-11 10:56:51 UTC (rev 165442)
@@ -44,10 +44,6 @@
$(global_cppflags) \
$(_javascript_core_cppflags)
-# 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.
_javascript_core_cppflags += \
-I$(srcdir)/Source \
-I$(srcdir)/Source/_javascript_Core \
@@ -74,10 +70,20 @@
-I$(srcdir)/Source/_javascript_Core/yarr \
-I$(top_builddir)/DerivedSources/_javascript_Core \
-I$(srcdir)/Source/WTF \
- -fno-omit-frame-pointer \
- -fno-tree-dce \
$(LLVM_CFLAGS)
+# 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.
+_javascript_core_cppflags += \
+ -fno-omit-frame-pointer
+
+if COMPILER_GCC
+_javascript_core_cppflags += \
+ -fno-tree-dce
+endif
+
_javascript_core_cflags += \
$(global_cflags) \
$(GLIB_CFLAGS) \
Modified: releases/WebKitGTK/webkit-2.4/Source/autotools/SetupAutomake.m4 (165441 => 165442)
--- releases/WebKitGTK/webkit-2.4/Source/autotools/SetupAutomake.m4 2014-03-11 10:45:56 UTC (rev 165441)
+++ releases/WebKitGTK/webkit-2.4/Source/autotools/SetupAutomake.m4 2014-03-11 10:56:51 UTC (rev 165442)
@@ -22,6 +22,9 @@
AM_CONDITIONAL([OS_DARWIN],[test "$os_darwin" = "yes"])
AM_CONDITIONAL([OS_FREEBSD],[test "$os_freebsd" = "yes"])
+AM_CONDITIONAL([COMPILER_GCC],[test "$c_compiler" = "gcc" && test "$cxx_compiler" = "g++"])
+AM_CONDITIONAL([COMPILER_CLANG],[test "$c_compiler" = "clang" && test "$cxx_compiler" = "clang++"])
+
# Target conditionals.
AM_CONDITIONAL([TARGET_X11], [test "$enable_x11_target" = "yes"])
AM_CONDITIONAL([TARGET_WAYLAND], [test "$enable_wayland_target" = "yes"])
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
