* config/i386/cpuid.h (__get_cpuid_max): Move misplaced comment.

[pf3gnuchains/gcc-fork.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9204574..07485db 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1803,7 +1803,7 @@ fi],[if test x"$default_enable_lto" = x"yes" ; then
   # -flto it won't be needed until after installation anyway.
     case $target in
       *-cygwin*|*-mingw*) ;;
-      x86_64-apple-darwin*) ;;
+      *-apple-darwin*) ;;
       *) if test x"$enable_lto" = x"yes"; then
        AC_MSG_ERROR([LTO support is not enabled for this target.])
         fi
@@ -2935,6 +2935,9 @@ do
       skip_next=$separate_arg
       continue
       ;;
+    --enable-multilib | --disable-multilib)
+      continue
+      ;;
     -*)
       # An option.  Add it.
       case $ac_arg in
@@ -3003,10 +3006,12 @@ if test x${is_cross_compiler} = xyes ; then
   target_configargs="--with-cross-host=${host_noncanonical} ${target_configargs}"
 fi
 
-# Default to --enable-multilib.
-if test x${enable_multilib} = x ; then
+# Pass --enable-multilib to target dirs; default to --enable-multilib.
+case $enable_multilib in
+'' | yes)
   target_configargs="--enable-multilib ${target_configargs}"
-fi
+  ;;
+esac
 
 # Pass --with-newlib if appropriate.  Note that target_configdirs has
 # changed from the earlier setting of with_newlib.