X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=config-ml.in;h=c968bf0d71918eaaa41665555836e0aa030475f2;hb=043b7057fd25d89f2539850adf2c06de6ea42742;hp=b5b53e5c607d4757db8c643d72053ddb9eabf007;hpb=2a59259c98fe1a436c425b340802182d543b809b;p=deliverable%2Fbinutils-gdb.git

diff --git a/config-ml.in b/config-ml.in
index b5b53e5c60..c968bf0d71 100644
--- a/config-ml.in
+++ b/config-ml.in
@@ -9,9 +9,9 @@
 #
 # if [ "${srcdir}" = "." ] ; then
 #   if [ "${with_target_subdir}" != "." ] ; then
-#     . ${srcdir}/${with_multisrctop}../../config-ml.in
+#     . ${with_multisrctop}../../config-ml.in
 #   else
-#     . ${srcdir}/${with_multisrctop}../config-ml.in
+#     . ${with_multisrctop}../config-ml.in
 #   fi
 # else
 #   . ${srcdir}/../config-ml.in
@@ -44,6 +44,10 @@
 # inter-library references also work in the source tree because symlink trees
 # are built when srcdir=.
 #
+# Unfortunately, trying to access the libraries in the build tree requires
+# the user to manually choose which library to use as GCC won't be able to
+# find the right one.  This is viewed as the lesser of two evils.
+#
 # Configure variables:
 # ${with_target_subdir} = "." for native, or ${target_alias} for cross.
 # Set by top level Makefile.
@@ -54,7 +58,8 @@
 #
 # Makefile variables:
 # MULTISRCTOP = number of multilib levels in source tree (+1 if cross)
-# MULITBUILDTOP = number of multilib levels in build tree
+# (FIXME: note that this is different than ${with_multisrctop}.  Check out.).
+# MULTIBUILDTOP = number of multilib levels in build tree
 # MULTIDIRS = list of multilib subdirs (eg: m68000 m68020 ...)
 # (only defined in each library's main Makefile).
 # MULTISUBDIR = installed subdirectory name with leading '/' (eg: /m68000)
@@ -65,23 +70,38 @@
 # libraries as desired.
 
 # We have to handle being invoked by both Cygnus configure and Autoconf.
-# We except both to define `srcdir' and `target' (we *could* figure them
-# out, but we'd have to do work that they're already done to figure them out).
-# We expect Cygnus configure to define `arguments' and Autoconf to define
-# `ac_configure_args'.
+#
+# Cygnus configure incoming variables:
+# srcdir, subdir, host, arguments
+#
+# Autoconf incoming variables:
+# srcdir, host, ac_configure_args
+#
+# We *could* figure srcdir and host out, but we'd have to do work that
+# our caller has already done to figure them out and requiring these two
+# seems reasonable.
+# Note that `host' in this case is GCC's `target'.  Target libraries are
+# configured for a particular host.
 
 if [ -n "${ac_configure_args}" ]; then
   Makefile=${ac_file-Makefile}
   ml_config_shell=${CONFIG_SHELL-/bin/sh}
   ml_arguments="${ac_configure_args}"
+  ml_realsrcdir=${srcdir}
 else
   Makefile=${Makefile-Makefile}
   ml_config_shell=${config_shell-/bin/sh}
   ml_arguments="${arguments}"
+  if [ -n "${subdir}" -a "${subdir}" != "." ] ; then
+    ml_realsrcdir=${srcdir}/${subdir}
+  else
+    ml_realsrcdir=${srcdir}
+  fi
 fi
 
 # Scan all the arguments and set all the ones we need.
 
+ml_verbose=--verbose
 for option in ${ml_arguments}
 do
   case $option in
@@ -111,6 +131,9 @@ do
   --norecursion | --no*)
 	ml_norecursion=yes
 	;;
+  --silent | --sil* | --quiet | --q*)
+	ml_verbose=--silent
+	;;
   --verbose | --v | --verb*)
 	ml_verbose=--verbose
 	;;
@@ -144,18 +167,20 @@ if [ "${enable_multilib}" = yes ]; then
 ml_toplevel_p=no
 if [ -z "${with_multisubdir}" ]; then
   if [ "${srcdir}" = "." ]; then
+    # Use ${ml_realsrcdir} instead of ${srcdir} here to account for ${subdir}.
     # ${with_target_subdir} = "." for native, otherwise target alias.
     if [ "${with_target_subdir}" = "." ]; then
-      if [ -f ../config-ml.in ]; then
+      if [ -f ${ml_realsrcdir}/../config-ml.in ]; then
 	ml_toplevel_p=yes
       fi
     else
-      if [ -f ../../config-ml.in ]; then
+      if [ -f ${ml_realsrcdir}/../../config-ml.in ]; then
 	ml_toplevel_p=yes
       fi
     fi
   else
-    if [ -f ${srcdir}/../config-ml.in ]; then
+    # Use ${ml_realsrcdir} instead of ${srcdir} here to account for ${subdir}.
+    if [ -f ${ml_realsrcdir}/../config-ml.in ]; then
       ml_toplevel_p=yes
     fi
   fi
@@ -163,129 +188,111 @@ fi
 
 # If this is the library's top level directory, set multidirs to the
 # multilib subdirs to support.  This lives at the top because we need
-# `multidirs' set right away, and this section is subject to frequent
-# editing (addition of new targets, etc.).
+# `multidirs' set right away.
 
 if [ "${ml_toplevel_p}" = yes ]; then
 
-case "${target}" in
-# start-sanitize-arc
-arc-sbp-elf*)
-	if [ x$enable_biendian = xyes ]
+multidirs=
+for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do
+  dir=`echo $i | sed -e 's/;.*$//'`
+  if [ "${dir}" = "." ]; then
+    true
+  else
+    if [ -z "${multidirs}" ]; then
+      multidirs="${dir}"
+    else
+      multidirs="${multidirs} ${dir}"
+    fi
+  fi
+done
+
+# Target libraries are configured for the host they run on, so we check
+# $host here, not $target.
+
+case "${host}" in
+arc-*-elf*)
+	if [ x$enable_biendian != xyes ]
 	then
-		multidirs="be host graphics audio be/host be/graphics be/audio"
-	else
-		multidirs="host graphics audio"
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *be*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
 	fi
 	;;
-arc-*-*)
-	multidirs="be"
-	;;
-# end-sanitize-arc
-hppa*-*-*)
-	multidirs="soft-float"
-	;;
-m68*-*-aout* | m68*-*-coff* | m68*-*-elf* | m68*-*-vxworks*)
-	multidirs="m68000 m68020 m68881 msoft-float m68000/m68881 m68000/msoft-float m68020/m68881 m68020/msoft-float"
-	;;
-i960-*-*)
-	multidirs=float
-	;;
-sparclite-*-* | sparclitefrw*-*-*)
-	multidirs="mfpu msoft-float mflat mno-flat mfpu/mflat mfpu/mno-flat msoft-float/mflat msoft-float/mno-flat"
-	;;
-sparc-*-* | sparcfrw*-*-*)
-	multidirs="soft v8 soft/v8"
-	;;
-z8k-*-coff)
-	multidirs="z8001 std z8001/std"
-	;;
-h8300-*-*)
-	multidirs=h8300h
-	;;
-h8500-*-*)
-	multidirs="mbig msmall mcompact mmedium"
-	;;
-# start-sanitize-jaguar
-jaguar-*-*)
-	multidirs="be"
-	;;
-# end-sanitize-jaguar
-sh-*-*)
-	multidirs="ml m2 ml/m2"
-# start-sanitize-sh3e
-	multidirs="ml m2 ml/m2 m3e ml/m3e"
-# end-sanitize-sh3e
-	;;
-mips*-*-*)
-	# Note that not all of these will be built for a particular
-	# target; what is build depends upon the output gcc
-	# --print-multi-lib.  We configure them all, to make our life
-	# simpler here.  If somebody cares about configuration
-	# efficiency, they will need to switch off on the various
-	# targets to configure just the directories needed for that
-	# target.
-	# 
-	# In the long run, it would be better to configure based on
-	# the output of gcc --print-multi-lib, but, to do that, we
-	# would have to build gcc before configuring newlib.
-	#
-	# Default to including the single-float directories.
-	if [ x$enable_single_float = x ]; then
-	  enable_single_float=yes
+arm-*-*)
+	if [ x"$enable_fpu" = xno ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *fpu*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
 	fi
-	if [ x$enable_single_float = xyes ]; then
-	  multidirs="soft-float single el eb mips1 mips3 soft-float/el soft-float/eb soft-float/mips1 soft-float/mips3 soft-float/el/mips1 soft-float/el/mips3 soft-float/eb/mips1 soft-float/eb/mips3 single/el single/eb single/mips1 single/mips3 single/el/mips1 single/el/mips3 single/eb/mips1 single/eb/mips3 el/mips1 el/mips3 eb/mips1 eb/mips3"
-	else
-	  multidirs="soft-float el eb mips1 mips3 soft-float/el soft-float/eb soft-float/mips1 soft-float/mips3 soft-float/el/mips1 soft-float/el/mips3 soft-float/eb/mips1 soft-float/eb/mips3 el/mips1 el/mips3 eb/mips1 eb/mips3"
+	if [ x"$enable_26bit" = xno ]
+	then
+	  old_multidirs=${multidirs}
+	  multidirs=""
+	  for x in ${old_multidirs}; do
+	    case "${x}" in
+	      *26bit*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	    esac
+	  done
 	fi
-	if [ x$enable_biendian = xno ]
+	if [ x"$enable_underscore" = xno ]
 	then
-	  old_multidirs="${multidirs}"
+	  old_multidirs=${multidirs}
 	  multidirs=""
 	  for x in ${old_multidirs}; do
-	    case "$x" in
-	      *endian* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	    case "${x}" in
+	      *under*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_softfloat = xno ]
+	if [ x"$enable_interwork" = xno ]
 	then
-	  old_multidirs="${multidirs}"
+	  old_multidirs=${multidirs}
 	  multidirs=""
 	  for x in ${old_multidirs}; do
-	    case "$x" in
-	      *soft-float* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	    case "${x}" in
+	      *interwork*) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_relocatable = xno ]
+	if [ x$enable_biendian = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *relocatable* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *le* ) : ;;
+	      *be* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_sysv = xno ]
+	if [ x"$enable_nofmult" = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *sysv* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *nofmult* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
 	;;
-powerpc-ibm-aix* | rs6000-ibm-aix*)
-	multidirs="soft-float common soft-float/common"
+m68*-*-*)
 	if [ x$enable_softfloat = xno ]
 	then
 	  old_multidirs="${multidirs}"
@@ -293,82 +300,103 @@ powerpc-ibm-aix* | rs6000-ibm-aix*)
 	  for x in ${old_multidirs}; do
 	    case "$x" in
 	      *soft-float* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_commoncpu = xno ]
+	if [ x$enable_m68881 = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *common* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *m68881* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	;;
-powerpc-*-eabiaix*)
-	multidirs="soft-float relocatable little sysv little/sysv relocatable/little relocatable/sysv relocatable/little/sysv soft-float/relocatable soft-float/little soft-float/sysv soft-float/little/sysv soft-float/relocatable/little soft-float/relocatable/sysv soft-float/relocatable/little/sysv"
-	if [ x$enable_biendian = xno ]
+	if [ x$enable_m68000 = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *endian* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *m68000* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_softfloat = xno ]
+	if [ x$enable_m68020 = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *soft-float* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *m68020* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_relocatable = xno ]
+	;;
+mips*-*-*)
+	if [ x$enable_single_float = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *relocatable* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *single* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_sysv = xno ]
+	if [ x$enable_biendian = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *sysv* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *el* ) : ;;
+	      *eb* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	;;
-powerpc-*-eabi* | powerpc-*-elf* | powerpc-*-sysv4*)
-	multidirs="soft-float relocatable little aix little/aix relocatable/little relocatable/aix relocatable/little/aix soft-float/relocatable soft-float/little soft-float/aix soft-float/little/aix soft-float/relocatable/little soft-float/relocatable/aix soft-float/relocatable/little/aix aixdesc soft-float/aixdesc"
-	if [ x$enable_biendian = xno ]
+	if [ x$enable_softfloat = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *endian* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *soft-float* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
+	case " $multidirs " in
+	*" mabi=64 "*)
+	  # We will not be able to create libraries with -mabi=64 if
+	  # we cannot even link a trivial program.  It usually
+	  # indicates the 64bit libraries are missing.
+	  if echo 'main() {}' > conftest.c &&
+	     ${CC-gcc} -mabi=64 conftest.c -o conftest; then
+	    :
+	  else
+	    echo Could not link program with -mabi=64, disabling it.
+	    old_multidirs="${multidirs}"
+	    multidirs=""
+	    for x in ${old_multidirs}; do
+	      case "$x" in
+	      *mabi=64* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	      esac
+	    done
+	  fi
+	  rm -f conftest.c conftest
+	  ;;
+	esac
+	;;
+powerpc*-*-* | rs6000*-*-*)
 	if [ x$enable_softfloat = xno ]
 	then
 	  old_multidirs="${multidirs}"
@@ -376,65 +404,62 @@ powerpc-*-eabi* | powerpc-*-elf* | powerpc-*-sysv4*)
 	  for x in ${old_multidirs}; do
 	    case "$x" in
 	      *soft-float* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_relocatable = xno ]
+	if [ x$enable_powercpu = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *relocatable* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      power | */power | */power/* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_aix = xno ]
+	if [ x$enable_powerpccpu = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *aix* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *powerpc* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	;;
-powerpcle-*-eabi* | powerpcle-*-elf* | powerpcle-*-sysv4*)
-	multidirs="soft-float relocatable big aix big/aix relocatable/big relocatable/aix relocatable/big/aix soft-float/relocatable soft-float/big soft-float/aix soft-float/big/aix soft-float/relocatable/big soft-float/relocatable/aix soft-float/relocatable/big/aix"
-	if [ x$enable_biendian = xno ]
+	if [ x$enable_powerpcos = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *endian* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *mcall-linux* | *mcall-solaris* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_softfloat = xno ]
+	if [ x$enable_biendian = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *soft-float* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *mlittle* | *mbig* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
-	if [ x$enable_relocatable = xno ]
+	if [ x$enable_sysv = xno ]
 	then
 	  old_multidirs="${multidirs}"
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *relocatable* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *mcall-sysv* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
@@ -444,17 +469,42 @@ powerpcle-*-eabi* | powerpcle-*-elf* | powerpcle-*-sysv4*)
 	  multidirs=""
 	  for x in ${old_multidirs}; do
 	    case "$x" in
-	      *aix* ) : ;;
-	      *) if [ x"$multidirs" = x ]; then multidirs="$x"; else multidirs="${multidirs} ${x}"; fi ;;
+	      *mcall-aix* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
 	    esac
 	  done
 	fi
 	;;
-*)
-	multidirs=
+sparc*-*-*)
+	case " $multidirs " in
+	*" m64 "*)
+	  # We will not be able to create libraries with -m64 if
+	  # we cannot even link a trivial program.  It usually
+	  # indicates the 64bit libraries are missing.
+	  if echo 'main() {}' > conftest.c &&
+	     ${CC-gcc} -m64 conftest.c -o conftest; then
+	    :
+	  else
+	    echo Could not link program with -m64, disabling it.
+	    old_multidirs="${multidirs}"
+	    multidirs=""
+	    for x in ${old_multidirs}; do
+	      case "$x" in
+	      *m64* ) : ;;
+	      *) multidirs="${multidirs} ${x}" ;;
+	      esac
+	    done
+	  fi
+	  rm -f conftest.c conftest
+	  ;;
+	esac
 	;;
 esac
 
+# Remove extraneous blanks from multidirs.
+# Tests like `if [ -n "$multidirs" ]' require it.
+multidirs=`echo "$multidirs" | sed -e 's/^[ ][ ]*//' -e 's/[ ][ ]*$//' -e 's/[ ][ ]*/ /g'`
+
 # Add code to library's top level makefile to handle building the multilib
 # subdirs.
 
@@ -479,9 +529,12 @@ multi-do:
 		flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
 		if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
 				CFLAGS="$(CFLAGS) $${flags}" \
+				prefix="$(prefix)" \
+				exec_prefix="$(exec_prefix)" \
 				CXXFLAGS="$(CXXFLAGS) $${flags}" \
 				LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
 				LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
+				LDFLAGS="$(LDFLAGS) $${flags}" \
 				$(DO)); then \
 		  true; \
 		else \
@@ -499,7 +552,7 @@ multi-clean:
 	if [ -z "$(MULTIDIRS)" ]; then \
 	  true; \
 	else \
-	  lib=`pwd | sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
+	  lib=`pwd | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
 	  for dir in Makefile $(MULTIDIRS); do \
 	    if [ -f ../$${dir}/$${lib}/Makefile ]; then \
 	      if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
@@ -519,7 +572,7 @@ mv Makefile.tem ${Makefile}
 fi # ${ml_toplevel_p} = yes
 
 if [ "${ml_verbose}" = --verbose ]; then
-  echo "Adding multilib support to Makefile in `pwd`"
+  echo "Adding multilib support to Makefile in ${ml_realsrcdir}"
   if [ "${ml_toplevel_p}" = yes ]; then
     echo "multidirs=${multidirs}"
   fi
@@ -621,7 +674,24 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
       echo "pwd: `pwd`"
     fi
 
-    if [ -d ${ml_dir} ]; then true; else mkdir ${ml_dir}; fi
+    if [ -d ${ml_dir} ]; then true; else
+      # ``mkdir -p ${ml_dir}'' See also mkinstalldirs.
+      pathcomp=""
+      for d in `echo ":${ml_dir}" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`; do
+        pathcomp="$pathcomp$d"
+        case "$pathcomp" in
+          -* ) pathcomp=./$pathcomp ;;
+        esac
+        if test ! -d "$pathcomp"; then
+           echo "mkdir $pathcomp" 1>&2
+           mkdir "$pathcomp" > /dev/null 2>&1 || lasterr=$?
+        fi
+        if test ! -d "$pathcomp"; then
+	   exit $lasterr
+        fi
+        pathcomp="$pathcomp/"
+      done
+    fi
     if [ -d ${ml_dir}/${ml_libdir} ]; then true; else mkdir ${ml_dir}/${ml_libdir}; fi
 
     # Eg: if ${ml_dir} = m68000/m68881, dotdot = ../../
@@ -637,6 +707,13 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
       fi
       (cd ${ml_dir}/${ml_libdir};
        ../${dotdot}${ml_unsubdir}symlink-tree ../${dotdot}${ml_unsubdir}${ml_libdir} "")
+      if [ -f ${ml_dir}/${ml_libdir}/Makefile ]; then
+	if [ x"${MAKE}" = x ]; then
+	  (cd ${ml_dir}/${ml_libdir}; make distclean)
+	else
+	  (cd ${ml_dir}/${ml_libdir}; ${MAKE} distclean)
+	fi
+      fi
       ml_newsrcdir="."
       ml_srcdiroption=
       multisrctop=${dotdot}
@@ -665,9 +742,86 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
     cd ${ml_dir}/${ml_libdir}
 
     if [ -f ${ml_newsrcdir}/configure ]; then
-      ml_recprog=${ml_newsrcdir}/configure
+      ml_recprog="${ml_newsrcdir}/configure --cache-file=../config.cache"
+    fi
+
+    # find compiler flag corresponding to ${ml_dir}
+    for i in `${CC-gcc} --print-multi-lib 2>/dev/null`; do 
+      dir=`echo $i | sed -e 's/;.*$//'`
+      if [ "${dir}" = "${ml_dir}" ]; then
+        flags=`echo $i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`
+        break
+      fi
+    done
+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags"'
+
+    if [ "${with_target_subdir}" = "." ]; then
+	CC_=$CC' '
+	CXX_=$CXX' '
+    else
+	# Create a regular expression that matches any string as long
+	# as ML_POPDIR.
+	popdir_rx=`echo ${ML_POPDIR} | sed 's,.,.,g'`
+	CC_=
+	for arg in ${CC}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    CC_="${CC_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    CC_="${CC_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    CC_="${CC_}${arg} " ;;
+	  esac
+	done
+
+	CXX_=
+	for arg in ${CXX}; do
+	  case $arg in
+	  -[BIL]"${ML_POPDIR}"/*)
+	    CXX_="${CXX_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  "${ML_POPDIR}"/*)
+	    CXX_="${CXX_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+	  *)
+	    CXX_="${CXX_}${arg} " ;;
+	  esac
+	done
+
+	if test "x${LD_LIBRARY_PATH+set}" = xset; then
+	  LD_LIBRARY_PATH_=
+	  for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
+	    case "$arg" in
+	    "${ML_POPDIR}"/*)
+	      arg=`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`
+	      ;;
+	    esac
+	    if test "x$LD_LIBRARY_PATH_" != x; then
+	      LD_LIBRARY_PATH_=$LD_LIBRARY_PATH_:$arg
+	    else
+	      LD_LIBRARY_PATH_=$arg
+	    fi
+          done
+	  ml_config_env="$ml_config_env LD_LIBRARY_PATH=$LD_LIBRARY_PATH_"
+	fi
+
+	if test "x${SHLIB_PATH+set}" = xset; then
+	  SHLIB_PATH_=
+	  for arg in `echo "$SHLIB_PATH" | tr ':' ' '`; do
+	    case "$arg" in
+	    "${ML_POPDIR}"/*)
+	      arg=`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`
+	      ;;
+	    esac
+	    if test "x$SHLIB_PATH_" != x; then
+	      SHLIB_PATH_=$SHLIB_PATH_:$arg
+	    else
+	      SHLIB_PATH_=$arg
+	    fi
+          done
+	  ml_config_env="$ml_config_env SHLIB_PATH=$SHLIB_PATH_"
+	fi
     fi
-    if eval ${ml_config_shell} ${ml_recprog} \
+
+    if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
 	--with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
 	${ml_arguments} ${ml_srcdiroption} ; then
       true