/:

	Merge from gcc:
	PR bootstrap/43615
	PR bootstrap/43328
	Revert:
	2010-03-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
	* configure.ac: Do not pass --enable-multilib nor
	--disable-multilib in baseargs.  Accept explicitly passed
	--enable_multilib.
	* configure: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index 027f923376aa0b1b77a39a8bc76c455abf3ad2f3..cf51807869c26f5d9a0698631b6d61404c4d9f2a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2010-04-08  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+       Merge from gcc:
+       PR bootstrap/43615
+       PR bootstrap/43328
+       Revert:
+       2010-03-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+       * configure.ac: Do not pass --enable-multilib nor
+       --disable-multilib in baseargs.  Accept explicitly passed
+       --enable_multilib.
+       * configure: Regenerate.
+
 2010-03-31  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
        PR bootstrap/43328

diff --git a/configure b/configure
index d885973ce6f84c32062262f5ef97978578a2748a..c2c406e7334ed4f879d46ea3ce4752a52315506f 100755 (executable)
--- a/configure
+++ b/configure
@@ -7778,9 +7778,6 @@ do
       skip_next=$separate_arg
       continue
       ;;
-    --enable-multilib | --disable-multilib)
-      continue
-      ;;
     -*)
       # An option.  Add it.
       case $ac_arg in
@@ -7849,12 +7846,10 @@ if test x${is_cross_compiler} = xyes ; then
   target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
 fi
 
-# Pass --enable-multilib to target dirs; default to --enable-multilib.
-case $enable_multilib in
-'' | yes)
+# Default to --enable-multilib.
+if test x${enable_multilib} = x ; then
   target_configargs="--enable-multilib ${target_configargs}"
-  ;;
-esac
+fi
 
 # Pass --with-newlib if appropriate.  Note that target_configdirs has
 # changed from the earlier setting of with_newlib.

diff --git a/configure.ac b/configure.ac
index 55e99980adc987c370b6cfaa420a6ddf9a01882d..72407f86878077893d929a9ae6faa8ab74baf404 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -2882,9 +2882,6 @@ do
       skip_next=$separate_arg
       continue
       ;;
-    --enable-multilib | --disable-multilib)
-      continue
-      ;;
     -*)
       # An option.  Add it.
       case $ac_arg in
@@ -2953,12 +2950,10 @@ if test x${is_cross_compiler} = xyes ; then
   target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
 fi
 
-# Pass --enable-multilib to target dirs; default to --enable-multilib.
-case $enable_multilib in
-'' | yes)
+# Default to --enable-multilib.
+if test x${enable_multilib} = x ; then
   target_configargs="--enable-multilib ${target_configargs}"
-  ;;
-esac
+fi
 
 # Pass --with-newlib if appropriate.  Note that target_configdirs has
 # changed from the earlier setting of with_newlib.