This commit was manufactured by cvs2svn to create tag 'sid-sid-snapshot-20120601

snapshot-20120601'.

Sprout from gdb_7_5-branch 2012-07-13 23:39:47 UTC cvs2svn 'This commit was manufactured by cvs2svn to create branch 'gdb_7_5-branch'.'
Cherrypick from master 2012-05-24 16:51:39 UTC Pedro Alves <palves@redhat.com> 'gdb/':
    ChangeLog
    configure
    configure.ac
    include/ChangeLog
    include/dwarf2.def
    include/dwarf2.h
    include/elf/ChangeLog
    include/elf/common.h
    include/elf/s390.h
    include/filenames.h
    include/gdb/ChangeLog
    include/opcode/ChangeLog
    include/opcode/avr.h
    include/opcode/mips.h
    include/opcode/xgate.h
    include/plugin-api.h
Delete:
    djunpack.bat
    include/gdb/gdb-index.h
    texinfo/texinfo.tex

1 files changed, 4 insertions, 4 deletions

diff --git a/configure.ac b/configure.ac
index 5efb4a32f..224127c1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2125,11 +2125,11 @@ if test "x$CFLAGS_FOR_TARGET" = x; then
   CFLAGS_FOR_TARGET=$CFLAGS
   case " $CFLAGS " in
     *" -O2 "*) ;;
-    *) CFLAGS_FOR_TARGET="-O2 $CFLAGS_FOR_TARGET" ;;
+    *) CFLAGS_FOR_TARGET="-O2 $CFLAGS" ;;
   esac
   case " $CFLAGS " in
     *" -g "* | *" -g3 "*) ;;
-    *) CFLAGS_FOR_TARGET="-g $CFLAGS_FOR_TARGET" ;;
+    *) CFLAGS_FOR_TARGET="-g $CFLAGS" ;;
   esac
 fi
 AC_SUBST(CFLAGS_FOR_TARGET)
@@ -2138,11 +2138,11 @@ if test "x$CXXFLAGS_FOR_TARGET" = x; then
   CXXFLAGS_FOR_TARGET=$CXXFLAGS
   case " $CXXFLAGS " in
     *" -O2 "*) ;;
-    *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS_FOR_TARGET" ;;
+    *) CXXFLAGS_FOR_TARGET="-O2 $CXXFLAGS" ;;
   esac
   case " $CXXFLAGS " in
     *" -g "* | *" -g3 "*) ;;
-    *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS_FOR_TARGET" ;;
+    *) CXXFLAGS_FOR_TARGET="-g $CXXFLAGS" ;;
   esac
 fi
 AC_SUBST(CXXFLAGS_FOR_TARGET)