Fix revno 115051 merge issues.

4 files changed, 9 insertions, 69 deletions

diff --git a/ChangeLog.linaro b/ChangeLog.linaro
index 6ac57416592..ddd79241610 100644
--- a/ChangeLog.linaro
+++ b/ChangeLog.linaro
@@ -1,3 +1,10 @@
+2013-02-10  Yvan Roux  <yvan.roux@linaro.org>
+	    Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.in (s-mlib): Fix revno 115051 merge issues.
+	* configure.ac: Likewise.
+	* configure: Regenerate.
+
 2013-02-09  Yvan Roux  <yvan.roux@linaro.org>
 
 	Merge from FSF arm/aarch64-4.7-branch r194976..r195716.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 11ce56451e4..5f222112de4 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -542,18 +542,6 @@ host_hook_obj=@out_host_hook_obj@
 
 # Multiarch support
 enable_multiarch = @enable_multiarch@
-with_float = @with_float@
-ifeq ($(enable_multiarch),yes)
-  if_multiarch = $(1)
-else ifeq ($(enable_multiarch),auto)
-  # SYSTEM_HEADER_DIR is makefile syntax, cannot be evaluated in configure.ac
-  if_multiarch = $(if $(wildcard $(shell echo $(SYSTEM_HEADER_DIR))/../../usr/lib/*/crti.o),$(1))
-else
-  if_multiarch =
-endif
-
-# Multiarch support
-enable_multiarch = @enable_multiarch@
 with_cpu = @with_cpu@
 with_float = @with_float@
 ifeq ($(enable_multiarch),yes)
diff --git a/gcc/configure b/gcc/configure
index 68b58d85dc6..e69d9fddfb0 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -7039,36 +7039,6 @@ 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 ;;
-esac
-else
-  enable_multiarch=auto
-fi
-
-if test x${enable_multiarch} = xauto; then
-  if test x${with_native_system_header_dir} != x; then
-    ma_msg_suffix=", disabled auto check (configured with --native-system-header-dir)"
-    enable_multiarch=no
-  fi
-  if test x$host != x$target && test "x$with_sysroot" = x; then
-    ma_msg_suffix=", disabled auto check (cross build configured without --with-sysroot)"
-    enable_multiarch=no
-  fi
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for multiarch configuration" >&5
-$as_echo_n "checking for multiarch configuration... " >&6; }
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_multiarch$ma_msg_suffix" >&5
-$as_echo "$enable_multiarch$ma_msg_suffix" >&6; }
-
-# needed for setting the multiarch name for soft-float/hard-float ABIs
-
-
-# Determine whether or not multiarch is enabled.
-# Check whether --enable-multiarch was given.
-if test "${enable_multiarch+set}" = set; then :
   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 ;;
@@ -18077,7 +18047,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 18080 "configure"
+#line 18050 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18183,7 +18153,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 18186 "configure"
+#line 18156 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
diff --git a/gcc/configure.ac b/gcc/configure.ac
index 4687c7af544..b30b926a953 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -627,31 +627,6 @@ 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) ;;
-esac], [enable_multiarch=auto])
-if test x${enable_multiarch} = xauto; then
-  if test x${with_native_system_header_dir} != x; then
-    ma_msg_suffix=", disabled auto check (configured with --native-system-header-dir)"
-    enable_multiarch=no
-  fi
-  if test x$host != x$target && test "x$with_sysroot" = x; then
-    ma_msg_suffix=", disabled auto check (cross build configured without --with-sysroot)"
-    enable_multiarch=no
-  fi
-fi
-AC_MSG_CHECKING(for multiarch configuration)
-AC_SUBST(enable_multiarch)
-AC_MSG_RESULT($enable_multiarch$ma_msg_suffix)
-
-# needed for setting the multiarch name for soft-float/hard-float ABIs
-AC_SUBST(with_float)
-
-# Determine whether or not multiarch is enabled.
-AC_ARG_ENABLE(multiarch,
-[AS_HELP_STRING([--enable-multiarch],
-		[enable support for multiarch paths])],
 [case "${enableval}" in
 yes|no|auto) enable_multiarch=$enableval;;
 *) AC_MSG_ERROR(bad value ${enableval} given for --enable-multiarch option) ;;