configure.ac (multiarch): Use $enableval instead of $withval.

2012-11-24  Matthias Klose  <doko@ubuntu.com>

        * configure.ac (multiarch): Use $enableval instead of $withval.
        * configure: Regenerate.
        * config/i386/t-kfreebsd (MULTILIB_OSDIRNAMES): Filter out x32.

From-SVN: r193776

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f7b3c9241183d5ae085e61aa5386ae45c354c322..0ac58eee48803076924fffd437b2996f1bc47925 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2012-11-24  Matthias Klose  <doko@ubuntu.com>
+
+       * configure.ac (multiarch): Use $enableval instead of $withval.
+       * configure: Regenerate.
+       * config/i386/t-kfreebsd (MULTILIB_OSDIRNAMES): Filter out x32.
+
 2012-11-23  Tobias Burnus  <burnus@net-b.de>
 
        * doc/invoke.texi (-fsanitize=address): Remove obsolete

diff --git a/gcc/config/i386/t-kfreebsd b/gcc/config/i386/t-kfreebsd
index b4310df8afbb94994c12a70a2e7982c03308c565..b8338a9f9fcc0575d3a29ac629f1a5997852c450 100644 (file)
--- a/gcc/config/i386/t-kfreebsd
+++ b/gcc/config/i386/t-kfreebsd
@@ -2,4 +2,4 @@ MULTIARCH_DIRNAME = $(call if_multiarch,i386-kfreebsd-gnu)
 
 # MULTILIB_OSDIRNAMES are set in t-linux64.
 KFREEBSD_OS = $(filter kfreebsd%, $(word 3, $(subst -, ,$(target))))
-MULTILIB_OSDIRNAMES := $(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES))
+MULTILIB_OSDIRNAMES := $(filter-out mx32=% $(subst linux,$(KFREEBSD_OS),$(MULTILIB_OSDIRNAMES)))

diff --git a/gcc/configure b/gcc/configure
index b16fb3f45bfb19b43a77778bd444dd992c37e5b0..e2c119e735a2b2ae99c4cc1ec0ad95051ac7d91b 100755 (executable)
--- a/gcc/configure
+++ b/gcc/configure
@@ -7024,9 +7024,9 @@ fi
 # Determine whether or not multiarch is enabled.
 # Check whether --enable-multiarch was given.
 if test "${enable_multiarch+set}" = set; then :
-  enableval=$enable_multiarch; case "${withval}" in
-yes|no|auto) enable_multiarch=$withval;;
-*) as_fn_error "bad value ${withval} given for --enable-multiarch option" "$LINENO" 5 ;;
+  enableval=$enable_multiarch; case "${enableval}" in
+yes|no|auto) enable_multiarch=$enableval;;
+*) as_fn_error "bad value ${enableval} given for --enable-multiarch option" "$LINENO" 5 ;;
 esac
 else
   enable_multiarch=auto

diff --git a/gcc/configure.ac b/gcc/configure.ac
index 4878c3567d8b796220b5bbfa2d783bc6dc30715e..c6f57bd667ca006389deb018bb0cd0146348f49f 100644 (file)
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -617,9 +617,9 @@ AC_SUBST(enable_multilib)
 AC_ARG_ENABLE(multiarch,
 [AS_HELP_STRING([--enable-multiarch],
                [enable support for multiarch paths])],
-[case "${withval}" in
-yes|no|auto) enable_multiarch=$withval;;
-*) AC_MSG_ERROR(bad value ${withval} given for --enable-multiarch option) ;;
+[case "${enableval}" in
+yes|no|auto) enable_multiarch=$enableval;;
+*) AC_MSG_ERROR(bad value ${enableval} given for --enable-multiarch option) ;;
 esac], [enable_multiarch=auto])
 if test x${enable_multiarch} = xauto; then
   if test x${with_native_system_header_dir} != x; then