summaryrefslogtreecommitdiff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/ChangeLog8
-rw-r--r--config/bootstrap-O1.mk1
-rw-r--r--config/bootstrap-O3.mk1
-rw-r--r--config/bootstrap-debug.mk2
-rw-r--r--config/mt-gnu3
-rw-r--r--config/multi.m47
6 files changed, 18 insertions, 4 deletions
diff --git a/config/ChangeLog b/config/ChangeLog
index d670de4e371..e1ca63e7471 100644
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,11 @@
+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-05-07 Paolo Bonzini
Sync from src:
diff --git a/config/bootstrap-O1.mk b/config/bootstrap-O1.mk
new file mode 100644
index 00000000000..031645a1251
--- /dev/null
+++ b/config/bootstrap-O1.mk
@@ -0,0 +1 @@
+BOOT_CFLAGS := -O1 $(filter-out -O%, $(BOOT_CFLAGS))
diff --git a/config/bootstrap-O3.mk b/config/bootstrap-O3.mk
new file mode 100644
index 00000000000..b269a3f7e12
--- /dev/null
+++ b/config/bootstrap-O3.mk
@@ -0,0 +1 @@
+BOOT_CFLAGS := -O3 $(filter-out -O%, $(BOOT_CFLAGS))
diff --git a/config/bootstrap-debug.mk b/config/bootstrap-debug.mk
new file mode 100644
index 00000000000..521be824194
--- /dev/null
+++ b/config/bootstrap-debug.mk
@@ -0,0 +1,2 @@
+STAGE2_CFLAGS += -g0
+do-compare = $(SHELL) $(srcdir)/contrib/compare-debug $$f1 $$f2
diff --git a/config/mt-gnu b/config/mt-gnu
index 2400fa44e55..15bf4171603 100644
--- a/config/mt-gnu
+++ b/config/mt-gnu
@@ -1,2 +1 @@
-CXXFLAGS_FOR_TARGET = $(CXXFLAGS) $(SYSROOT_CFLAGS_FOR_TARGET) \
- $(DEBUG_PREFIX_CFLAGS_FOR_TARGET) -D_GNU_SOURCE
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS) -D_GNU_SOURCE
diff --git a/config/multi.m4 b/config/multi.m4
index 98417679f51..5b62ecc0aa0 100644
--- a/config/multi.m4
+++ b/config/multi.m4
@@ -1,5 +1,5 @@
## -*- Autoconf -*-
-# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006
+# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2008
# Free Software Foundation, Inc.
#
# This file is free software; the Free Software Foundation
@@ -62,4 +62,7 @@ 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"])])dnl
+CC="$CC"
+CXX="$CXX"
+GFORTRAN="$GFORTRAN"
+GCJ="$GCJ"])])dnl