Skip to content

R
riscv-gcc-1
Commit c406e779 by Nathanael Nerode
Options

configure.in: Remove uses of "for x in .. 

	* configure.in: Remove uses of "for x in .. ${foo}" idiom.
	* configure: Regenerate.

From-SVN: r70967
parent d0d0e9ac
Showing with 26 additions and 65 deletions
gcc/ChangeLog
2003-08-31 Nathanael Nerode <neroden@gcc.gnu.org> 2003-08-31 Nathanael Nerode <neroden@gcc.gnu.org>
* configure.in: Remove uses of "for x in .. ${foo}" idiom.
* configure: Regenerate.
* config.gcc: Remove references to install_headers_dir, now unused * config.gcc: Remove references to install_headers_dir, now unused
since introduction of config.build. since introduction of config.build.
* config.gcc (i860-*-sysv4*): Don't set unused USG, SVR3 defines. * config.gcc (i860-*-sysv4*): Don't set unused USG, SVR3 defines.
......
gcc/configure
...@@ -5559,7 +5559,7 @@ cd $holddir ...@@ -5559,7 +5559,7 @@ cd $holddir
# Conditionalize the makefile for this host machine. # Conditionalize the makefile for this host machine.
xmake_file= xmake_file=
for f in .. ${host_xmake_file} for f in ${host_xmake_file}
do do
if test -f ${srcdir}/config/$f if test -f ${srcdir}/config/$f
then then
...@@ -5569,7 +5569,7 @@ done ...@@ -5569,7 +5569,7 @@ done
# Conditionalize the makefile for this target machine. # Conditionalize the makefile for this target machine.
tmake_file_= tmake_file_=
for f in .. ${tmake_file} for f in ${tmake_file}
do do
if test -f ${srcdir}/config/$f if test -f ${srcdir}/config/$f
then then
...@@ -7421,11 +7421,9 @@ enable_languages=`echo "${enable_languages}" | sed -e 's/[ ,][ ,]*/,/g' -e 's/ ...@@ -7421,11 +7421,9 @@ enable_languages=`echo "${enable_languages}" | sed -e 's/[ ,][ ,]*/,/g' -e 's/
# First scan to see if an enabled language requires some other language. # First scan to see if an enabled language requires some other language.
# We assume that a given config-lang.in will list all the language # We assume that a given config-lang.in will list all the language
# front ends it requires, even if some are required indirectly. # front ends it requires, even if some are required indirectly.
for lang in ${srcdir}/*/config-lang.in .. for lang in ${srcdir}/*/config-lang.in
do do
case $lang in case $lang in
..)
;;
# The odd quoting in the next line works around # The odd quoting in the next line works around
# an apparent bug in bash 1.12 on linux. # an apparent bug in bash 1.12 on linux.
${srcdir}/[*]/config-lang.in) ${srcdir}/[*]/config-lang.in)
...@@ -7452,10 +7450,9 @@ done ...@@ -7452,10 +7450,9 @@ done
expected_languages=`echo ,${enable_languages}, | sed -e 's:,: :g' -e 's: *: :g' -e 's: *: :g' -e 's:^ ::' -e 's: $::'` expected_languages=`echo ,${enable_languages}, | sed -e 's:,: :g' -e 's: *: :g' -e 's: *: :g' -e 's:^ ::' -e 's: $::'`
found_languages= found_languages=
subdirs= subdirs=
for lang in ${srcdir}/*/config-lang.in .. for lang in ${srcdir}/*/config-lang.in
do do
case $lang in case $lang in
..) ;;
# The odd quoting in the next line works around # The odd quoting in the next line works around
# an apparent bug in bash 1.12 on linux. # an apparent bug in bash 1.12 on linux.
${srcdir}/[*]/config-lang.in) ;; ${srcdir}/[*]/config-lang.in) ;;
...@@ -7564,7 +7561,7 @@ fi ...@@ -7564,7 +7561,7 @@ fi
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6 echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
echo "configure:7568: checking whether to enable maintainer-specific portions of Makefiles" >&5 echo "configure:7565: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given. # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode" enableval="$enable_maintainer_mode"
...@@ -7627,10 +7624,8 @@ all_gtfiles_files_files= ...@@ -7627,10 +7624,8 @@ all_gtfiles_files_files=
language_hooks="Make-hooks" language_hooks="Make-hooks"
for s in .. $subdirs for s in $subdirs
do do
if test $s != ".."
then
language= language=
boot_language= boot_language=
compilers= compilers=
...@@ -7656,15 +7651,11 @@ do ...@@ -7656,15 +7651,11 @@ do
all_stagestuff="$all_stagestuff $stagestuff" all_stagestuff="$all_stagestuff $stagestuff"
all_outputs="$all_outputs $outputs" all_outputs="$all_outputs $outputs"
all_gtfiles="$all_gtfiles $gtfiles" all_gtfiles="$all_gtfiles $gtfiles"
for f in .. $gtfiles for f in $gtfiles
do do
if test $f != ".."
then
all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} " all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} "
all_gtfiles_files_files="$all_gtfiles_files_files ${f} " all_gtfiles_files_files="$all_gtfiles_files_files ${f} "
fi
done done
fi
done done
# Pick up gtfiles for c # Pick up gtfiles for c
...@@ -7672,22 +7663,16 @@ gtfiles= ...@@ -7672,22 +7663,16 @@ gtfiles=
s="c" s="c"
. ${srcdir}/c-config-lang.in . ${srcdir}/c-config-lang.in
all_gtfiles="$all_gtfiles $gtfiles" all_gtfiles="$all_gtfiles $gtfiles"
for f in .. $gtfiles for f in $gtfiles
do do
if test $f != ".."
then
all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} " all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} "
all_gtfiles_files_files="$all_gtfiles_files_files ${f} " all_gtfiles_files_files="$all_gtfiles_files_files ${f} "
fi
done done
check_languages= check_languages=
for language in .. $all_languages for language in $all_languages
do do
if test $language != ".."
then
check_languages="$check_languages check-$language" check_languages="$check_languages check-$language"
fi
done done
# Since we can't use `::' targets, we link each language in # Since we can't use `::' targets, we link each language in
...@@ -7704,11 +7689,9 @@ target_list="all.build all.cross start.encap rest.encap tags \ ...@@ -7704,11 +7689,9 @@ target_list="all.build all.cross start.encap rest.encap tags \
for t in $target_list for t in $target_list
do do
x= x=
for lang in .. $all_languages for lang in $all_languages
do do
if test $lang != ".."; then
x="$x $lang.$t" x="$x $lang.$t"
fi
done done
echo "lang.$t: $x" >> Make-hooks echo "lang.$t: $x" >> Make-hooks
done done
...@@ -8401,11 +8384,9 @@ xauto-host.h:config.in) ...@@ -8401,11 +8384,9 @@ xauto-host.h:config.in)
echo > cstamp-h ;; echo > cstamp-h ;;
esac esac
# Make sure all the subdirs exist. # Make sure all the subdirs exist.
for d in .. $subdirs for d in $subdirs
do do
if test $d != ..; then
test -d $d || mkdir $d test -d $d || mkdir $d
fi
done done
# If the host supports symlinks, point stage[1234] at ../stage[1234] so # If the host supports symlinks, point stage[1234] at ../stage[1234] so
# bootstrapping and the installation procedure can still use # bootstrapping and the installation procedure can still use
...@@ -8414,8 +8395,7 @@ done ...@@ -8414,8 +8395,7 @@ done
# This is virtually a duplicate of what happens in configure.lang; we do # This is virtually a duplicate of what happens in configure.lang; we do
# an extra check to make sure this only happens if ln -s can be used. # an extra check to make sure this only happens if ln -s can be used.
if test "$symbolic_link" = "ln -s"; then if test "$symbolic_link" = "ln -s"; then
for d in .. ${subdirs} fixinc ; do for d in ${subdirs} fixinc ; do
if test $d != ..; then
STARTDIR=`${PWDCMD-pwd}` STARTDIR=`${PWDCMD-pwd}`
cd $d cd $d
for t in stage1 stage2 stage3 stage4 stageprofile stagefeedback include for t in stage1 stage2 stage3 stage4 stageprofile stagefeedback include
...@@ -8424,7 +8404,6 @@ if test "$symbolic_link" = "ln -s"; then ...@@ -8424,7 +8404,6 @@ if test "$symbolic_link" = "ln -s"; then
$symbolic_link ../$t $t 2>/dev/null $symbolic_link ../$t $t 2>/dev/null
done done
cd $STARTDIR cd $STARTDIR
fi
done done
else true ; fi else true ; fi
......
gcc/configure.in
...@@ -1264,7 +1264,7 @@ cd $holddir ...@@ -1264,7 +1264,7 @@ cd $holddir
# Conditionalize the makefile for this host machine. # Conditionalize the makefile for this host machine.
xmake_file= xmake_file=
for f in .. ${host_xmake_file} for f in ${host_xmake_file}
do do
if test -f ${srcdir}/config/$f if test -f ${srcdir}/config/$f
then then
...@@ -1274,7 +1274,7 @@ done ...@@ -1274,7 +1274,7 @@ done
# Conditionalize the makefile for this target machine. # Conditionalize the makefile for this target machine.
tmake_file_= tmake_file_=
for f in .. ${tmake_file} for f in ${tmake_file}
do do
if test -f ${srcdir}/config/$f if test -f ${srcdir}/config/$f
then then
...@@ -2534,11 +2534,9 @@ enable_languages=`echo "${enable_languages}" | sed -e 's/[[ ,]][[ ,]]*/,/g' -e ...@@ -2534,11 +2534,9 @@ enable_languages=`echo "${enable_languages}" | sed -e 's/[[ ,]][[ ,]]*/,/g' -e
# First scan to see if an enabled language requires some other language. # First scan to see if an enabled language requires some other language.
# We assume that a given config-lang.in will list all the language # We assume that a given config-lang.in will list all the language
# front ends it requires, even if some are required indirectly. # front ends it requires, even if some are required indirectly.
for lang in ${srcdir}/*/config-lang.in .. for lang in ${srcdir}/*/config-lang.in
do do
case $lang in case $lang in
..)
;;
# The odd quoting in the next line works around # The odd quoting in the next line works around
# an apparent bug in bash 1.12 on linux. # an apparent bug in bash 1.12 on linux.
changequote(,)dnl changequote(,)dnl
...@@ -2567,10 +2565,9 @@ done ...@@ -2567,10 +2565,9 @@ done
expected_languages=`echo ,${enable_languages}, | sed -e 's:,: :g' -e 's: *: :g' -e 's: *: :g' -e 's:^ ::' -e 's: $::'` expected_languages=`echo ,${enable_languages}, | sed -e 's:,: :g' -e 's: *: :g' -e 's: *: :g' -e 's:^ ::' -e 's: $::'`
found_languages= found_languages=
subdirs= subdirs=
for lang in ${srcdir}/*/config-lang.in .. for lang in ${srcdir}/*/config-lang.in
do do
case $lang in case $lang in
..) ;;
# The odd quoting in the next line works around # The odd quoting in the next line works around
# an apparent bug in bash 1.12 on linux. # an apparent bug in bash 1.12 on linux.
changequote(,)dnl changequote(,)dnl
...@@ -2738,10 +2735,8 @@ all_gtfiles_files_files= ...@@ -2738,10 +2735,8 @@ all_gtfiles_files_files=
language_hooks="Make-hooks" language_hooks="Make-hooks"
for s in .. $subdirs for s in $subdirs
do do
if test $s != ".."
then
language= language=
boot_language= boot_language=
compilers= compilers=
...@@ -2767,15 +2762,11 @@ do ...@@ -2767,15 +2762,11 @@ do
all_stagestuff="$all_stagestuff $stagestuff" all_stagestuff="$all_stagestuff $stagestuff"
all_outputs="$all_outputs $outputs" all_outputs="$all_outputs $outputs"
all_gtfiles="$all_gtfiles $gtfiles" all_gtfiles="$all_gtfiles $gtfiles"
for f in .. $gtfiles for f in $gtfiles
do do
if test $f != ".."
then
all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} " all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} "
all_gtfiles_files_files="$all_gtfiles_files_files ${f} " all_gtfiles_files_files="$all_gtfiles_files_files ${f} "
fi
done done
fi
done done
# Pick up gtfiles for c # Pick up gtfiles for c
...@@ -2783,22 +2774,16 @@ gtfiles= ...@@ -2783,22 +2774,16 @@ gtfiles=
s="c" s="c"
. ${srcdir}/c-config-lang.in . ${srcdir}/c-config-lang.in
all_gtfiles="$all_gtfiles $gtfiles" all_gtfiles="$all_gtfiles $gtfiles"
for f in .. $gtfiles for f in $gtfiles
do do
if test $f != ".."
then
all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} " all_gtfiles_files_langs="$all_gtfiles_files_langs ${s} "
all_gtfiles_files_files="$all_gtfiles_files_files ${f} " all_gtfiles_files_files="$all_gtfiles_files_files ${f} "
fi
done done
check_languages= check_languages=
for language in .. $all_languages for language in $all_languages
do do
if test $language != ".."
then
check_languages="$check_languages check-$language" check_languages="$check_languages check-$language"
fi
done done
# Since we can't use `::' targets, we link each language in # Since we can't use `::' targets, we link each language in
...@@ -2815,11 +2800,9 @@ target_list="all.build all.cross start.encap rest.encap tags \ ...@@ -2815,11 +2800,9 @@ target_list="all.build all.cross start.encap rest.encap tags \
for t in $target_list for t in $target_list
do do
x= x=
for lang in .. $all_languages for lang in $all_languages
do do
if test $lang != ".."; then
x="$x $lang.$t" x="$x $lang.$t"
fi
done done
echo "lang.$t: $x" >> Make-hooks echo "lang.$t: $x" >> Make-hooks
done done
...@@ -3008,11 +2991,9 @@ xauto-host.h:config.in) ...@@ -3008,11 +2991,9 @@ xauto-host.h:config.in)
echo > cstamp-h ;; echo > cstamp-h ;;
esac esac
# Make sure all the subdirs exist. # Make sure all the subdirs exist.
for d in .. $subdirs for d in $subdirs
do do
if test $d != ..; then
test -d $d || mkdir $d test -d $d || mkdir $d
fi
done done
# If the host supports symlinks, point stage[1234] at ../stage[1234] so # If the host supports symlinks, point stage[1234] at ../stage[1234] so
# bootstrapping and the installation procedure can still use # bootstrapping and the installation procedure can still use
...@@ -3021,8 +3002,7 @@ done ...@@ -3021,8 +3002,7 @@ done
# This is virtually a duplicate of what happens in configure.lang; we do # This is virtually a duplicate of what happens in configure.lang; we do
# an extra check to make sure this only happens if ln -s can be used. # an extra check to make sure this only happens if ln -s can be used.
if test "$symbolic_link" = "ln -s"; then if test "$symbolic_link" = "ln -s"; then
for d in .. ${subdirs} fixinc ; do for d in ${subdirs} fixinc ; do
if test $d != ..; then
STARTDIR=`${PWDCMD-pwd}` STARTDIR=`${PWDCMD-pwd}`
cd $d cd $d
for t in stage1 stage2 stage3 stage4 stageprofile stagefeedback include for t in stage1 stage2 stage3 stage4 stageprofile stagefeedback include
...@@ -3031,7 +3011,6 @@ if test "$symbolic_link" = "ln -s"; then ...@@ -3031,7 +3011,6 @@ if test "$symbolic_link" = "ln -s"; then
$symbolic_link ../$t $t 2>/dev/null $symbolic_link ../$t $t 2>/dev/null
done done
cd $STARTDIR cd $STARTDIR
fi
done done
else true ; fi else true ; fi
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment