[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[demarchi at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit f9c96b591212506bc6afb5f694c8b112558e0d09
Author: demarchi at webkit.org <demarchi at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 00:00:55 2010 +0000

    2010-08-30  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
    
            Reviewed by Adam Barth.
    
            [EFL] Remove compiler optimization for gcc 4.5.1
            https://bugs.webkit.org/show_bug.cgi?id=44520
    
            GCC 4.5.1 generates wrong code because of -ftree-sra which is enabled
            by default at any optimization level.
    
            Newer and older versions are not affected, so check for compiler
            version before disabling this.
    
            * cmake/WebKitHelpers.cmake: add flag depending on compiler version.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66426 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/ChangeLog b/ChangeLog
index 7d9fb36..b3c97ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2010-08-30  Lucas De Marchi  <lucas.demarchi at profusion.mobi>
+
+        Reviewed by Adam Barth.
+
+        [EFL] Remove compiler optimization for gcc 4.5.1
+        https://bugs.webkit.org/show_bug.cgi?id=44520
+
+        GCC 4.5.1 generates wrong code because of -ftree-sra which is enabled
+        by default at any optimization level.
+
+        Newer and older versions are not affected, so check for compiler
+        version before disabling this.
+
+        * cmake/WebKitHelpers.cmake: add flag depending on compiler version.
+
 2010-08-30  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/cmake/WebKitHelpers.cmake b/cmake/WebKitHelpers.cmake
index ae48e14..55549d6 100644
--- a/cmake/WebKitHelpers.cmake
+++ b/cmake/WebKitHelpers.cmake
@@ -6,6 +6,14 @@ MACRO(WEBKIT_SET_EXTRA_COMPILER_FLAGS _target)
     IF (${OLD_COMPILE_FLAGS} STREQUAL "OLD_COMPILE_FLAGS-NOTFOUND")
         SET(OLD_COMPILE_FLAGS "")
     ENDIF ()
+
+    # Disable some optimizations on buggy compiler versions
+    # GCC 4.5.1 does not implement -ftree-sra correctly
+    EXEC_PROGRAM(${CMAKE_CXX_COMPILER} ARGS -dumpversion OUTPUT_VARIABLE COMPILER_VERSION)
+    IF (${COMPILER_VERSION} STREQUAL "4.5.1")
+        SET(OLD_COMPILE_FLAGS "${OLD_COMPILE_FLAGS} -fno-tree-sra")
+    ENDIF ()
+
     IF (SHARED_CORE)
         SET_TARGET_PROPERTIES (${_target} PROPERTIES
             COMPILE_FLAGS "-fno-exceptions -fstrict-aliasing ${OLD_COMPILE_FLAGS}")

-- 
WebKit Debian packaging