diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2012-09-25 14:27:47 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2012-09-25 14:27:47 +0200 |
| commit | dadbefd3596a06d06f539e4c0048326a26ac3c75 (patch) | |
| tree | afb77c983a1fa14d7d79ddab8118e8359a7ef9a9 | |
| parent | 915efd1fc987429382050fd69bf040229b38c9a5 (diff) | |
| download | gcc-dadbefd3596a06d06f539e4c0048326a26ac3c75.zip gcc-dadbefd3596a06d06f539e4c0048326a26ac3c75.tar.gz gcc-dadbefd3596a06d06f539e4c0048326a26ac3c75.tar.bz2 | |
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
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rwxr-xr-x | gcc/configure | 4 | ||||
| -rw-r--r-- | gcc/configure.ac | 4 |
3 files changed, 11 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c50d182..44c2ed1 100644 --- 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 b656d9e..ff98a22 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 5a26022..453088e 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) |