drew
/
acadia-newlib
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Paolo Bonzini 2004-06-01 07:46:01 +00:00
parent e16662211d
commit 559fdbbd6a
2 changed files with 27 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -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> 2004-06-01 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (all.normal): Rename to all. * Makefile.tpl (all.normal): Rename to all.

19
config-ml.in
View File

@ -1,7 +1,7 @@
# Configure fragment invoked in the post-target section for subdirs # Configure fragment invoked in the post-target section for subdirs
# wanting multilib support. # 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. # Free Software Foundation, Inc.
# #
# This file is free software; you can redistribute it and/or modify # 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'`; \ flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \ if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
CFLAGS="$(CFLAGS) $${flags}" \ CFLAGS="$(CFLAGS) $${flags}" \
FFLAGS="$(FFLAGS) $${flags}" \
ADAFLAGS="$(ADAFLAGS) $${flags}" \
prefix="$(prefix)" \ prefix="$(prefix)" \
exec_prefix="$(exec_prefix)" \ exec_prefix="$(exec_prefix)" \
GCJFLAGS="$(GCJFLAGS) $${flags}" \ GCJFLAGS="$(GCJFLAGS) $${flags}" \
@ -777,11 +779,12 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
break break
fi fi
done 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 if [ "${with_target_subdir}" = "." ]; then
CC_=$CC' ' CC_=$CC' '
CXX_=$CXX' ' CXX_=$CXX' '
F77_=$F77' '
GCJ_=$GCJ' ' GCJ_=$GCJ' '
else else
# Create a regular expression that matches any string as long # Create a regular expression that matches any string as long
@ -811,6 +814,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
esac esac
done 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_= GCJ_=
for arg in ${GCJ}; do for arg in ${GCJ}; do
case $arg in case $arg in