re PR other/54692 (gcc doesn't build with "-Og -g")

	PR other/54692
	* configure.ac (CFLAGS, CXXFLAGS): Remove -Ofast or -Og
	properly.
	* configure: Regenerated.

From-SVN: r191702

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c50d18243040231322ed64f8281c171cadedfc50..44c2ed1a80a62da890b9de2a759af8981165f682 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-09-25  Jakub Jelinek  <jakub@redhat.com>
+
+       PR other/54692
+       * configure.ac (CFLAGS, CXXFLAGS): Remove -Ofast or -Og
+       properly.
+       * configure: Regenerated.
+
 2012-09-25  Georg-Johann Lay  <avr@gjlay.de>
 
        PR other/54701

diff --git a/gcc/configure b/gcc/configure
index b656d9e5266d78811b6fc2ad53c26fec65418f75..ff98a2254eb0b2c9d7b5d1a111f6758d73667e1b 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -4863,8 +4863,8 @@ fi
 # optimizations to be activated explicitly by the toplevel.
 case "$CC" in
   */prev-gcc/xgcc*) ;;
-  *) CFLAGS=`echo $CFLAGS | sed "s/-O[s0-9]* *//" `
-     CXXFLAGS=`echo $CXXFLAGS | sed "s/-O[s0-9]* *//" ` ;;
+  *) CFLAGS=`echo "$CFLAGS " | sed -e "s/-Ofast[       ]//" -e "s/-O[gs][      ]//" -e "s/-O[0-9]*[    ]//" `
+     CXXFLAGS=`echo "$CXXFLAGS " | sed -e "s/-Ofast[   ]//" -e "s/-O[gs][      ]//" -e "s/-O[0-9]*[    ]//" ` ;;
 esac
 
 

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 5a2602289737321e8847f84018a352656c05200b..453088e2fee6a7f8dec1043e21210c23c67446b8 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -296,8 +296,8 @@ AC_SUBST(OUTPUT_OPTION)
 # optimizations to be activated explicitly by the toplevel.
 case "$CC" in
   */prev-gcc/xgcc*) ;;
-  *) CFLAGS=`echo $CFLAGS | sed "s/-O[[s0-9]]* *//" `
-     CXXFLAGS=`echo $CXXFLAGS | sed "s/-O[[s0-9]]* *//" ` ;;
+  *) CFLAGS=`echo "$CFLAGS " | sed -e "s/-Ofast[[      ]]//" -e "s/-O[[gs]][[  ]]//" -e "s/-O[[0-9]]*[[        ]]//" `
+     CXXFLAGS=`echo "$CXXFLAGS " | sed -e "s/-Ofast[[  ]]//" -e "s/-O[[gs]][[  ]]//" -e "s/-O[[0-9]]*[[        ]]//" ` ;;
 esac
 AC_SUBST(CFLAGS)
 AC_SUBST(CXXFLAGS)