From: Jakub Jelinek Date: Tue, 25 Sep 2012 12:27:47 +0000 (+0200) Subject: re PR other/54692 (gcc doesn't build with "-Og -g") X-Git-Tag: misc/gccgo-go1_1_2~651 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dadbefd3596a06d06f539e4c0048326a26ac3c75;p=thirdparty%2Fgcc.git 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 c50d18243040..44c2ed1a80a6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2012-09-25 Jakub Jelinek + + PR other/54692 + * configure.ac (CFLAGS, CXXFLAGS): Remove -Ofast or -Og + properly. + * configure: Regenerated. + 2012-09-25 Georg-Johann Lay PR other/54701 diff --git a/gcc/configure b/gcc/configure index b656d9e5266d..ff98a2254eb0 100755 --- 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 5a2602289737..453088e2fee6 100644 --- 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)