[PATCH, committed] config-ml.in

David Edelsohn dje@watson.ibm.com
Mon Nov 8 00:38:00 GMT 2004


	DJ privately approved the patch with the change to add GFORTRAN
support instead of replacing F77 support.  The final version of the patch
is appended.

David


        * config-ml.in: Pass FCFLAGS for multilibs, handle GFORTRAN
        like CC.

Index: config-ml.in
===================================================================
RCS file: /cvs/gcc/gcc/config-ml.in,v
retrieving revision 1.31
diff -c -p -r1.31 config-ml.in
*** config-ml.in	30 May 2004 21:54:22 -0000	1.31
--- config-ml.in	7 Nov 2004 23:27:09 -0000
*************** multi-do:
*** 546,551 ****
--- 546,552 ----
  		flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
  		if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
  				CFLAGS="$(CFLAGS) $${flags}" \
+ 				FCFLAGS="$(FCFLAGS) $${flags}" \
  				FFLAGS="$(FFLAGS) $${flags}" \
  				ADAFLAGS="$(ADAFLAGS) $${flags}" \
  				prefix="$(prefix)" \
*************** if [ -n "${multidirs}" ] && [ -z "${ml_n
*** 779,791 ****
          break
        fi
      done
!     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
  	# as ML_POPDIR.
--- 780,793 ----
          break
        fi
      done
!     ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags"'
  
      if [ "${with_target_subdir}" = "." ]; then
  	CC_=$CC' '
  	CXX_=$CXX' '
  	F77_=$F77' '
  	GCJ_=$GCJ' '
+ 	GFORTRAN_=$GFORTRAN' '
      else
  	# Create a regular expression that matches any string as long
  	# as ML_POPDIR.
*************** if [ -n "${multidirs}" ] && [ -z "${ml_n
*** 838,843 ****
--- 840,857 ----
  	  esac
  	done
  
+ 	GFORTRAN_=
+ 	for arg in ${GFORTRAN}; do
+ 	  case $arg in
+ 	  -[BIL]"${ML_POPDIR}"/*)
+ 	    GFORTRAN_="${GFORTRAN_}"`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}"/*)
+ 	    GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+ 	  *)
+ 	    GFORTRAN_="${GFORTRAN_}${arg} " ;;
+ 	  esac
+ 	done
+ 
  	if test "x${LD_LIBRARY_PATH+set}" = xset; then
  	  LD_LIBRARY_PATH_=
  	  for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do



More information about the Gcc-patches mailing list