[CMAKE] Remove workaround for GCC 4.6
authorryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Feb 2014 16:34:35 +0000 (16:34 +0000)
committerryuan.choi@samsung.com <ryuan.choi@samsung.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 4 Feb 2014 16:34:35 +0000 (16:34 +0000)
https://bugs.webkit.org/show_bug.cgi?id=128176

Reviewed by Csaba Osztrogon√°c.

Since r162126, WebKit requires at least 4.7.

* CMakeLists.txt:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@163379 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebCore/CMakeLists.txt
Source/WebCore/ChangeLog

index a7ee236..692c911 100644 (file)
@@ -2554,20 +2554,6 @@ set(WebCore_SOURCES
     xml/parser/XMLDocumentParserScope.cpp
 )
 
-# GCC 4.6.x crashes when building this file with -O3 and -DNDEBUG.
-# References: https://bugs.webkit.org/show_bug.cgi?id=97268
-#             https://bugs.webkit.org/show_bug.cgi?id=114627
-if (CMAKE_COMPILER_IS_GNUCXX) # Can restrict based on the version.
-    string(TOUPPER "CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE}" _CXXFLAGS_VARNAME)
-
-    string(FIND "${${_CXXFLAGS_VARNAME}}" "-O3" _CXXFLAGS_O3_INDEX)
-    if (_CXXFLAGS_O3_INDEX GREATER -1)
-        string(REPLACE "-O3" "-O2" _CXXFLAGS ${${_CXXFLAGS_VARNAME}})
-        set_source_files_properties(Modules/websockets/WebSocketDeflater.cpp
-                                    PROPERTIES COMPILE_FLAGS "${_CXXFLAGS}")
-    endif ()
-endif ()
-
 set(WebCore_CSS_PROPERTY_NAMES
     ${WEBCORE_DIR}/css/CSSPropertyNames.in
 )
index 542b5e6..7ed3628 100644 (file)
@@ -1,3 +1,14 @@
+2014-02-04  Ryuan Choi  <ryuan.choi@samsung.com>
+
+        [CMAKE] Remove workaround for GCC 4.6
+        https://bugs.webkit.org/show_bug.cgi?id=128176
+
+        Reviewed by Csaba Osztrogon√°c.
+
+        Since r162126, WebKit requires at least 4.7.
+
+        * CMakeLists.txt:
+
 2014-02-04  Zan Dobersek  <zdobersek@igalia.com>
 
         Manage RuleSet and RuleData classes through std::unique_ptr instead of OwnPtr