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.
This commit is contained in:
Ralf Wildenhues 2010-04-08 19:44:08 +00:00
parent d96fead7bb
commit 5d239c6195
3 changed files with 18 additions and 16 deletions

View File

@ -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> 2010-03-31 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
PR bootstrap/43328 PR bootstrap/43328

11
configure vendored
View File

@ -7778,9 +7778,6 @@ do
skip_next=$separate_arg skip_next=$separate_arg
continue continue
;; ;;
--enable-multilib | --disable-multilib)
continue
;;
-*) -*)
# An option. Add it. # An option. Add it.
case $ac_arg in 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}" target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
fi fi
# Pass --enable-multilib to target dirs; default to --enable-multilib. # Default to --enable-multilib.
case $enable_multilib in if test x${enable_multilib} = x ; then
'' | yes)
target_configargs="--enable-multilib ${target_configargs}" target_configargs="--enable-multilib ${target_configargs}"
;; fi
esac
# Pass --with-newlib if appropriate. Note that target_configdirs has # Pass --with-newlib if appropriate. Note that target_configdirs has
# changed from the earlier setting of with_newlib. # changed from the earlier setting of with_newlib.

View File

@ -2882,9 +2882,6 @@ do
skip_next=$separate_arg skip_next=$separate_arg
continue continue
;; ;;
--enable-multilib | --disable-multilib)
continue
;;
-*) -*)
# An option. Add it. # An option. Add it.
case $ac_arg in 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}" target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
fi fi
# Pass --enable-multilib to target dirs; default to --enable-multilib. # Default to --enable-multilib.
case $enable_multilib in if test x${enable_multilib} = x ; then
'' | yes)
target_configargs="--enable-multilib ${target_configargs}" target_configargs="--enable-multilib ${target_configargs}"
;; fi
esac
# Pass --with-newlib if appropriate. Note that target_configdirs has # Pass --with-newlib if appropriate. Note that target_configdirs has
# changed from the earlier setting of with_newlib. # changed from the earlier setting of with_newlib.