[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    branches/KDE/3.5/kde-common/admin
From:       Adriaan de Groot <groot () kde ! org>
Date:       2006-02-01 23:34:19
Message-ID: 1138836859.771103.10609.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 504723 by adridg:

In response to 504414, attempt to re-introduce the check for
-fno-reorder-blocks. The previous versions caused very weird
errors later when doing g++ tests because -no-common was
accidentally (?) introduced as well.

This version needs testing by someone who has gcc 2.95.

CCMAIL: l.savernik@aon.at


 M  +9 -2      acinclude.m4.in  


--- branches/KDE/3.5/kde-common/admin/acinclude.m4.in #504722:504723
@@ -3099,7 +3099,7 @@
       if test $kde_use_debug_code = "full"; then
         CFLAGS="-g3 -fno-inline $CFLAGS"
       else
-        CFLAGS="-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline $CFLAGS"
+        CFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CFLAGS"
       fi
     else
       CFLAGS="-O2 $CFLAGS"
@@ -3134,7 +3134,7 @@
         if test "$kde_use_debug_code" = "full"; then
           CXXFLAGS="-g3 -fno-inline $CXXFLAGS"
         else
-          CXXFLAGS="-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline $CXXFLAGS"
+          CXXFLAGS="-g -O2 -fno-schedule-insns -fno-inline $CXXFLAGS"
         fi
       fi
       KDE_CHECK_COMPILER_FLAG(fno-builtin,[CXXFLAGS="-fno-builtin $CXXFLAGS"])
@@ -3194,6 +3194,13 @@
   AC_SUBST([HAVE_GCC_VISIBILITY])
 
   if test "$GXX" = "yes"; then
+    gcc_no_reorder_blocks=NO
+    KDE_CHECK_COMPILER_FLAG(fno-reorder-blocks,[gcc_no_reorder_blocks=YES])
+    if test $kde_use_debug_code = "full" && \
+       test "YES" = "$gcc_no_reorder_blocks" ; then
+          CXXFLAGS="$CXXFLAGS -fno-reorder-blocks"
+          CFLAGS="$CFLAGS -fno-reorder-blocks"
+    fi
     KDE_CHECK_COMPILER_FLAG(fno-exceptions,[CXXFLAGS="$CXXFLAGS -fno-exceptions"])
     KDE_CHECK_COMPILER_FLAG(fno-check-new, [CXXFLAGS="$CXXFLAGS -fno-check-new"])
     KDE_CHECK_COMPILER_FLAG(fno-common, [CXXFLAGS="$CXXFLAGS -fno-common"])
[prev in list] [next in list] [prev in thread] [next in thread]