Skip to content

R
riscv-gcc-1
Commit 4dc0535b by Zack Weinberg Committed by Zack Weinberg
Options

config.gcc: Remove default for xm_file. 

	* config.gcc: Remove default for xm_file.  Clean up local
	machine type handling.  Remove settings of xm_file to
	something that doesn't exist.  In the big switch, set xm_file,
	don't append to it (the value before the big switch is always
	null).  Don't force build_xm_file or host_xm_file to have a value.
	* configure.in: Remove default for xm_file.  Do not special
	case $cpu/xm-$cpu.h not existing.
	* configure: Regenerate.

From-SVN: r41106
parent b0835578
Showing with 30 additions and 35 deletions
gcc/ChangeLog
2001-04-04 Zack Weinberg <zackw@stanford.edu>
* config.gcc: Remove default for xm_file. Clean up local
machine type handling. Remove settings of xm_file to
something that doesn't exist. In the big switch, set xm_file,
don't append to it (the value before the big switch is always
null). Don't force build_xm_file or host_xm_file to have a value.
* configure.in: Remove default for xm_file. Do not special
case $cpu/xm-$cpu.h not existing.
* configure: Regenerate.
2001-04-04 Diego Novillo <dnovillo@redhat.com> 2001-04-04 Diego Novillo <dnovillo@redhat.com>
* simplify-rtx.c (simplify_binary_operation): Check for overflow * simplify-rtx.c (simplify_binary_operation): Check for overflow
......
gcc/config.gcc
...@@ -243,7 +243,6 @@ sparc*-*-*) ...@@ -243,7 +243,6 @@ sparc*-*-*)
esac esac
tm_file=${cpu_type}/${cpu_type}.h tm_file=${cpu_type}/${cpu_type}.h
xm_file=${cpu_type}/xm-${cpu_type}.h
if test -f ${srcdir}/config/${cpu_type}/${cpu_type}-protos.h; if test -f ${srcdir}/config/${cpu_type}/${cpu_type}-protos.h;
then then
tm_p_file=${cpu_type}/${cpu_type}-protos.h; tm_p_file=${cpu_type}/${cpu_type}-protos.h;
...@@ -301,17 +300,16 @@ esac ...@@ -301,17 +300,16 @@ esac
case $machine in case $machine in
# Support site-specific machine types. # Support site-specific machine types.
*local*) *local*)
cpu_type=`echo $machine | sed -e 's/-.*//'`
rest=`echo $machine | sed -e "s/$cpu_type-//"` rest=`echo $machine | sed -e "s/$cpu_type-//"`
xm_file=${cpu_type}/xm-$rest.h
tm_file=${cpu_type}/$rest.h tm_file=${cpu_type}/$rest.h
if test -f $srcdir/config/${cpu_type}/x-$rest; \ if test -f $srcdir/config/${cpu_type}/xm-$rest.h
then xmake_file=${cpu_type}/x-$rest; \ then xm_file=${cpu_type}/xm-$rest.h
else true; \
fi fi
if test -f $srcdir/config/${cpu_type}/t-$rest; \ if test -f $srcdir/config/${cpu_type}/x-$rest
then tmake_file=${cpu_type}/t-$rest; \ then xmake_file=${cpu_type}/x-$rest
else true; \ fi
if test -f $srcdir/config/${cpu_type}/t-$rest
then tmake_file=${cpu_type}/t-$rest
fi fi
;; ;;
1750a-*-*) 1750a-*-*)
...@@ -485,7 +483,7 @@ alpha*-*-vxworks*) ...@@ -485,7 +483,7 @@ alpha*-*-vxworks*)
alpha*-dec-vms*) alpha*-dec-vms*)
xm_defines=POSIX xm_defines=POSIX
tm_file=alpha/vms.h tm_file=alpha/vms.h
xm_file="${xm_file} alpha/xm-vms.h" xm_file=alpha/xm-vms.h
tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee" tmake_file="alpha/t-alpha alpha/t-vms alpha/t-ieee"
;; ;;
arm*-*-rtems*) arm*-*-rtems*)
...@@ -913,7 +911,6 @@ hppa*-*-lites*) ...@@ -913,7 +911,6 @@ hppa*-*-lites*)
;; ;;
hppa*-*-mpeix*) hppa*-*-mpeix*)
tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-mpeix.h" tm_file="${tm_file} pa/pa32-regs.h pa/long_double.h pa/som.h pa/pa-mpeix.h"
xm_file=pa/xm-pampeix.h
xmake_file=pa/x-pa-mpeix xmake_file=pa/x-pa-mpeix
echo "You must use gas. Assuming it is already installed." echo "You must use gas. Assuming it is already installed."
install_headers_dir=install-headers-tar install_headers_dir=install-headers-tar
...@@ -1220,7 +1217,6 @@ i[34567]86-*-osfrose*) # 386 using OSF/rose ...@@ -1220,7 +1217,6 @@ i[34567]86-*-osfrose*) # 386 using OSF/rose
;; ;;
i[34567]86-go32-rtems*) i[34567]86-go32-rtems*)
cpu_type=i386 cpu_type=i386
xm_file=i386/xm-go32.h
tm_file=i386/go32-rtems.h tm_file=i386/go32-rtems.h
tmake_file=t-rtems tmake_file=t-rtems
if test x$enable_threads = xyes; then if test x$enable_threads = xyes; then
...@@ -1354,7 +1350,7 @@ i[34567]86-*-udk*) # Intel x86 on SCO UW/OSR5 Dev Kit ...@@ -1354,7 +1350,7 @@ i[34567]86-*-udk*) # Intel x86 on SCO UW/OSR5 Dev Kit
;; ;;
i[34567]86-*-osf1*) # Intel 80386's running OSF/1 1.3+ i[34567]86-*-osf1*) # Intel 80386's running OSF/1 1.3+
cpu_type=i386 cpu_type=i386
xm_file="${xm_file} i386/xm-osf1elf.h" xm_file=i386/xm-osf1elf.h
xm_defines='USG POSIX USE_C_ALLOCA SMALL_ARG_MAX' xm_defines='USG POSIX USE_C_ALLOCA SMALL_ARG_MAX'
if test x$stabs = xyes if test x$stabs = xyes
then then
...@@ -1389,14 +1385,14 @@ i[34567]86-*-sysv*) # Intel 80386's running system V ...@@ -1389,14 +1385,14 @@ i[34567]86-*-sysv*) # Intel 80386's running system V
tmake_file="$tmake_file i386/t-crtpic" tmake_file="$tmake_file i386/t-crtpic"
;; ;;
i386-*-vsta) # Intel 80386's running VSTa kernel i386-*-vsta) # Intel 80386's running VSTa kernel
xm_file="${xm_file} i386/xm-vsta.h" xm_file=i386/xm-vsta.h
tm_file=i386/vsta.h tm_file=i386/vsta.h
tmake_file=i386/t-vsta tmake_file=i386/t-vsta
xmake_file=i386/x-vsta xmake_file=i386/x-vsta
;; ;;
i[34567]86-*-win32) i[34567]86-*-win32)
xm_defines=POSIX xm_defines=POSIX
xm_file="${xm_file} i386/xm-cygwin.h" xm_file=i386/xm-cygwin.h
float_format=i386 float_format=i386
tmake_file=i386/t-cygwin tmake_file=i386/t-cygwin
tm_file=i386/win32.h tm_file=i386/win32.h
...@@ -1409,7 +1405,7 @@ i[34567]86-*-win32) ...@@ -1409,7 +1405,7 @@ i[34567]86-*-win32)
;; ;;
i[34567]86-*-pe | i[34567]86-*-cygwin*) i[34567]86-*-pe | i[34567]86-*-cygwin*)
xm_defines=POSIX xm_defines=POSIX
xm_file="${xm_file} i386/xm-cygwin.h" xm_file=i386/xm-cygwin.h
float_format=i386 float_format=i386
tmake_file=i386/t-cygwin tmake_file=i386/t-cygwin
tm_file=i386/cygwin.h tm_file=i386/cygwin.h
...@@ -1424,7 +1420,7 @@ i[34567]86-*-mingw32*) ...@@ -1424,7 +1420,7 @@ i[34567]86-*-mingw32*)
tm_file=i386/mingw32.h tm_file=i386/mingw32.h
float_format=i386 float_format=i386
xm_defines=USG xm_defines=USG
xm_file="${xm_file} i386/xm-mingw32.h" xm_file=i386/xm-mingw32.h
tmake_file="i386/t-cygwin i386/t-mingw32" tmake_file="i386/t-cygwin i386/t-mingw32"
extra_objs=winnt.o extra_objs=winnt.o
xmake_file=i386/x-cygwin xmake_file=i386/x-cygwin
...@@ -1474,7 +1470,6 @@ i[34567]86-dg-dgux*) ...@@ -1474,7 +1470,6 @@ i[34567]86-dg-dgux*)
;; ;;
i860-alliant-*) # Alliant FX/2800 i860-alliant-*) # Alliant FX/2800
tm_file="${tm_file} svr4.h i860/sysv4.h i860/fx2800.h" tm_file="${tm_file} svr4.h i860/sysv4.h i860/fx2800.h"
xm_file="${xm_file}"
tmake_file=i860/t-fx2800 tmake_file=i860/t-fx2800
extra_parts="crtbegin.o crtend.o" extra_parts="crtbegin.o crtend.o"
;; ;;
...@@ -3469,9 +3464,8 @@ fi ...@@ -3469,9 +3464,8 @@ fi
# Save data on host machine in vars host_xm_file and host_xmake_file. # Save data on host machine in vars host_xm_file and host_xmake_file.
if test x$pass1done = x if test x$pass1done = x
then then
if test x"$xm_file" = x if test x$xm_file != x
then build_xm_file=$cpu_type/xm-$cpu_type.h then build_xm_file=$xm_file
else build_xm_file=$xm_file
fi fi
build_xm_defines=$xm_defines build_xm_defines=$xm_defines
build_install_headers_dir=$install_headers_dir build_install_headers_dir=$install_headers_dir
...@@ -3480,9 +3474,8 @@ then ...@@ -3480,9 +3474,8 @@ then
else else
if test x$pass2done = x if test x$pass2done = x
then then
if test x"$xm_file" = x if test x$xm_file != x
then host_xm_file=$cpu_type/xm-$cpu_type.h then host_xm_file=$xm_file
else host_xm_file=$xm_file
fi fi
host_xm_defines=$xm_defines host_xm_defines=$xm_defines
if test x"$xmake_file" = x if test x"$xmake_file" = x
......
gcc/configure.in
...@@ -642,9 +642,6 @@ then tm_file=$cpu_type/$cpu_type.h; fi ...@@ -642,9 +642,6 @@ then tm_file=$cpu_type/$cpu_type.h; fi
if test x"$extra_headers" = x if test x"$extra_headers" = x
then extra_headers=; fi then extra_headers=; fi
if test x"$xm_file" = x
then xm_file=$cpu_type/xm-$cpu_type.h; fi
if test x$md_file = x if test x$md_file = x
then md_file=$cpu_type/$cpu_type.md; fi then md_file=$cpu_type/$cpu_type.md; fi
...@@ -679,15 +676,13 @@ echo "Using \`$srcdir/config/$out_file' for machine-specific logic." ...@@ -679,15 +676,13 @@ echo "Using \`$srcdir/config/$out_file' for machine-specific logic."
echo "Using \`$srcdir/config/$md_file' as machine description file." echo "Using \`$srcdir/config/$md_file' as machine description file."
# If any of the xm_file variables contain nonexistent files, warn # If any of the xm_file variables contain nonexistent files, warn
# about them and drop them. But $cpu/xm-$cpu.h is allowed not to # about them and drop them.
# exist, if we have nothing for it to do.
changequote(,)dnl changequote(,)dnl
bx= bx=
for x in $build_xm_file; do for x in $build_xm_file; do
if test -f $srcdir/config/$x if test -f $srcdir/config/$x
then bx="$bx $x" then bx="$bx $x"
elif expr $x : '\([^/]*\)/xm-\1\.h' >/dev/null
then :
else AC_MSG_WARN($srcdir/config/$x does not exist.) else AC_MSG_WARN($srcdir/config/$x does not exist.)
fi fi
done done
...@@ -697,8 +692,6 @@ hx= ...@@ -697,8 +692,6 @@ hx=
for x in $host_xm_file; do for x in $host_xm_file; do
if test -f $srcdir/config/$x if test -f $srcdir/config/$x
then hx="$hx $x" then hx="$hx $x"
elif expr $x : '\([^/]*\)/xm-\1\.h' >/dev/null
then :
else AC_MSG_WARN($srcdir/config/$x does not exist.) else AC_MSG_WARN($srcdir/config/$x does not exist.)
fi fi
done done
...@@ -708,8 +701,6 @@ tx= ...@@ -708,8 +701,6 @@ tx=
for x in $xm_file; do for x in $xm_file; do
if test -f $srcdir/config/$x if test -f $srcdir/config/$x
then tx="$tx $x" then tx="$tx $x"
elif expr $x : '\([^/]*\)/xm-\1\.h' >/dev/null
then :
else AC_MSG_WARN($srcdir/config/$x does not exist.) else AC_MSG_WARN($srcdir/config/$x does not exist.)
fi fi
done done
......
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