2004-06-01 Paolo Bonzini <bonzini@gnu.org>

	Merge this patch from the gcc tree:

	2004-05-30  Andreas Jaeger  <aj@suse.de>
		    Jim Wilson <wilson@specifixinc.com>

	* config-ml.in: Pass FFLAGS and ADAFLAGS for multilibs, handle F77
	like CC.

diff --git a/ChangeLog b/ChangeLog
index 77ee52ba78e5161c44d327145b208112f37795e3..0873080322354e077415476899c6490dbe76a511 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2004-06-01  Paolo Bonzini <bonzini@gnu.org>
+
+       Merge this patch from the gcc tree:
+
+       2004-05-30  Andreas Jaeger  <aj@suse.de>
+                   Jim Wilson <wilson@specifixinc.com>
+
+       * config-ml.in: Pass FFLAGS and ADAFLAGS for multilibs, handle F77
+       like CC.
+
 2004-06-01  Paolo Bonzini  <bonzini@gnu.org>
 
        * Makefile.tpl (all.normal): Rename to all.

diff --git a/config-ml.in b/config-ml.in
index b2e4ea9cf9774f59bc49641f42dfc4963835cada..34874ce8bc0b46346e6c42362c8ce9bf09e1e56b 100644 (file)
--- a/config-ml.in
+++ b/config-ml.in
@@ -1,7 +1,7 @@
 # Configure fragment invoked in the post-target section for subdirs
 # wanting multilib support.
 #
-# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003
+# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004
 #   Free Software Foundation, Inc.
 #
 # This file is free software; you can redistribute it and/or modify
@@ -546,6 +546,8 @@ multi-do:
                flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
                if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
                                CFLAGS="$(CFLAGS) $${flags}" \
+                               FFLAGS="$(FFLAGS) $${flags}" \
+                               ADAFLAGS="$(ADAFLAGS) $${flags}" \
                                prefix="$(prefix)" \
                                exec_prefix="$(exec_prefix)" \
                                GCJFLAGS="$(GCJFLAGS) $${flags}" \
@@ -777,11 +779,12 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
         break
       fi
     done
-    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" GCJ="${GCJ_}$flags"'
+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags"'
 
     if [ "${with_target_subdir}" = "." ]; then
        CC_=$CC' '
        CXX_=$CXX' '
+       F77_=$F77' '
        GCJ_=$GCJ' '
     else
        # Create a regular expression that matches any string as long
@@ -811,6 +814,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
          esac
        done
 
+       F77_=
+       for arg in ${F77}; do
+         case $arg in
+         -[BIL]"${ML_POPDIR}"/*)
+           F77_="${F77_}"`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}"/*)
+           F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         *)
+           F77_="${F77_}${arg} " ;;
+         esac
+       done
+
        GCJ_=
        for arg in ${GCJ}; do
          case $arg in