7 files changed, 4 insertions, 33 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index d6ff5652d..b762abfb8 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,15 +1,3 @@
-2009-05-26  Rafael Avila de Espindola  <espindola@google.com>
-
-	* plugins.m4: New.
-
-2009-05-12  Alexandre Oliva  <aoliva@redhat.com>
-
-	* multi.m4: Save CXX, GFORTRAN and GCJ in config.status.
-	* mt-gnu (CXXFLAGS_FOR_TARGET): Adjust.
-	* bootstrap-O1.mk: New.
-	* bootstrap-O3.mk: New.
-	* bootstrap-debug.mk: New.
-
 2009-02-02  Doug Evans  <dje@google.com>
 
 	* tcl.m4 (SC_PATH_TCLCONFIG): Don't exit 0 if tclconfig fails.
diff --git a/config/bootstrap-O1.mk b/config/bootstrap-O1.mk
deleted file mode 100644
index 031645a12..000000000
--- a/config/bootstrap-O1.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOOT_CFLAGS := -O1 $(filter-out -O%, $(BOOT_CFLAGS))
diff --git a/config/bootstrap-O3.mk b/config/bootstrap-O3.mk
deleted file mode 100644
index b269a3f7e..000000000
--- a/config/bootstrap-O3.mk
+++ /dev/null
@@ -1 +0,0 @@
-BOOT_CFLAGS := -O3 $(filter-out -O%, $(BOOT_CFLAGS))
diff --git a/config/bootstrap-debug.mk b/config/bootstrap-debug.mk
deleted file mode 100644
index 521be8241..000000000
--- a/config/bootstrap-debug.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-STAGE2_CFLAGS += -g0
-do-compare = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
diff --git a/config/mt-gnu b/config/mt-gnu
index 15bf41716..2400fa44e 100644
--- a/config/mt-gnu
+++ b/config/mt-gnu
@@ -1 +1,2 @@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
+	$(DEBUG_PREFIX_CFLAGS_FOR_TARGET) -D_GNU_SOURCE
diff --git a/config/multi.m4 b/config/multi.m4
index 5b62ecc0a..98417679f 100644
--- a/config/multi.m4
+++ b/config/multi.m4
@@ -1,5 +1,5 @@
 ##                                                          -*- Autoconf -*-
-# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2008
+# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
 # Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
@@ -62,7 +62,4 @@ with_target_subdir="$with_target_subdir"
 ac_configure_args="${multilib_arg} ${ac_configure_args}"
 multi_basedir="$multi_basedir"
 CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-CC="$CC"
-CXX="$CXX"
-GFORTRAN="$GFORTRAN"
-GCJ="$GCJ"])])dnl
+CC="$CC"])])dnl
diff --git a/config/plugins.m4 b/config/plugins.m4
deleted file mode 100644
index 7ee8412aa..000000000
--- a/config/plugins.m4
+++ /dev/null
@@ -1,11 +0,0 @@
-AC_DEFUN([AC_PLUGINS],
-[
-AC_ARG_ENABLE([plugins],
-AS_HELP_STRING([--enable-plugins], [Enable support for plugins (defaults no)]),
-[case "${enableval}" in
-  yes | "") plugins=yes ;;
-  no) plugins=no ;;
-  *) plugins=yes ;;
- esac],
-[plugins=no])
-])