[src/trunk]: src/tools revert the previous; not intended to be part of that c...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8104e11ad5aa
branches:  trunk
changeset: 750309:8104e11ad5aa
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Dec 23 20:17:13 2009 +0000

description:
revert the previous; not intended to be part of that commit, or any commit

diffstat:

 tools/gcc/Makefile |  3 +--
 tools/gdb/Makefile |  3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diffs (34 lines):

diff -r f84334174215 -r 8104e11ad5aa tools/gcc/Makefile
--- a/tools/gcc/Makefile        Wed Dec 23 20:15:21 2009 +0000
+++ b/tools/gcc/Makefile        Wed Dec 23 20:17:13 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.33 2009/12/23 20:15:21 mrg Exp $
+#      $NetBSD: Makefile,v 1.34 2009/12/23 20:17:13 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -42,7 +42,6 @@
 CONFIGURE_ENV+= gcc_cv_libc_provides_ssp=yes
 
 MKNATIVE_ENV=  ${BINENV} ${CONFIGURE_ENV:NC*:NLD*} \
-                       BOOTSTRAP_CFLAGS=-O2 \
                        CC_FOR_BUILD=${HOST_CC:Q} \
                        CC=${CC:Q}' '${CCADDFLAGS:Q} \
                        CXX=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
diff -r f84334174215 -r 8104e11ad5aa tools/gdb/Makefile
--- a/tools/gdb/Makefile        Wed Dec 23 20:15:21 2009 +0000
+++ b/tools/gdb/Makefile        Wed Dec 23 20:17:13 2009 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.15 2009/12/23 20:15:21 mrg Exp $
+#      $NetBSD: Makefile,v 1.16 2009/12/23 20:17:13 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -42,7 +42,6 @@
     ${MACHINE_CPU} != "powerpc64"
 CONFIGURE_ARGS_SIM+= --disable-sim
 .endif
-CONFIGURE_ARGS_SIM+= --disable-sim
 
 native-gdb: .native/.configure_done
        @echo 'Extracting GDB configury for a native toolchain.'