config.gcc: Make the name of the extra-modes file adjustable by target stanzas.

	* config.gcc: Make the name of the extra-modes file adjustable
	by target stanzas.
	(s390x, strongarm, xscale stanzas): Use this facility.
	* configure.in: Update to match.
	* configure: Regenerate.

From-SVN: r54540

gcc/ChangeLog

+2002-06-11  Zack Weinberg  <zack@codesourcery.com>
+
+	* config.gcc: Make the name of the extra-modes file adjustable
+	by target stanzas.
+	(s390x, strongarm, xscale stanzas): Use this facility.
+	* configure.in: Update to match.
+	* configure: Regenerate.
+
 2002-06-11  Aldy Hernandez  <aldyh@redhat.com>
 
 	* config/rs6000/rs6000.c (rs6000_emit_minmax): Treat unsigned

gcc/config.gcc

@@ -69,6 +69,10 @@
 #			makefile-fragments, if different from
 #			"$cpu_type/t-$cpu_type".
 #
+#  extra_modes          The name of the file containing a list of extra
+#                       machine modes, if necessary and different from
+#                       "$cpu_type/$cpu_type-modes.def".
+#
 #  float_format		Set to the symbolic name for the floating-point
 #			formats used for this machine, if different from
 #			"i64".  Used to derive a header file name to
@@ -287,6 +291,11 @@ if test -f ${srcdir}/config/${cpu_type}/${cpu_type}-protos.h
 then
 	tm_p_file=${cpu_type}/${cpu_type}-protos.h
 fi
+extra_modes=
+if test -f ${srcdir}/config/${cpu_type}/${cpu_type}-modes.def
+then
+	extra_modes=${cpu_type}/${cpu_type}-modes.def
+fi
 
 case $machine in
 x86_64-*-*)
@@ -2201,6 +2210,7 @@ s390x-*-linux*)
 	tm_file="s390/s390x.h s390/s390.h dbxelf.h elfos.h svr4.h linux.h s390/linux.h"
 	tm_p_file=s390/s390-protos.h
 	md_file=s390/s390.md
+	extra_modes=s390/s390-modes.def
 	out_file=s390/s390.c
 	tmake_file="t-slibgcc-elf-ver t-linux s390/t-linux s390/t-linux64"
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o"
@@ -2582,18 +2592,21 @@ strongarm-*-elf*)
 	tmake_file=arm/t-strongarm-elf
 	out_file=arm/arm.c
 	md_file=arm/arm.md
+	extra_modes=arm/arm-modes.def
 	;;
 strongarm-*-coff*)
 	tm_file="arm/semi.h arm/aout.h arm/coff.h arm/strongarm-coff.h arm/arm.h"
 	tmake_file=arm/t-strongarm-coff
 	out_file=arm/arm.c
 	md_file=arm/arm.md
+	extra_modes=arm/arm-modes.def
 	;;
 strongarm-*-pe)
 	tm_file="arm/semi.h arm/aout.h arm/coff.h arm/strongarm-coff.h arm/arm.h arm/pe.h arm/strongarm-pe.h"
 	tmake_file=arm/t-strongarm-pe
 	out_file=arm/arm.c
 	md_file=arm/arm.md
+	extra_modes=arm/arm-modes.def
 	extra_objs=pe.o
 	;;
 thumb*-*-*)
@@ -2667,12 +2680,14 @@ xscale-*-elf)
 	tmake_file=arm/t-xscale-elf
 	out_file=arm/arm.c
 	md_file=arm/arm.md
+	extra_modes=arm/arm-modes.def
 	;;
 xscale-*-coff)
 	tm_file="arm/semi.h arm/aout.h arm/coff.h arm/xscale-coff.h arm/arm.h"
 	tmake_file=arm/t-xscale-coff
 	out_file=arm/arm.c
 	md_file=arm/arm.md
+	extra_modes=arm/arm-modes.def
 	;;
 xstormy16-*-elf)
 	# For historical reasons, the target files omit the 'x'.

gcc/configure

@@ -5078,11 +5078,11 @@ if test x$thread_file = x; then
 fi
 
 # Look for a file containing extra machine modes.
-if test -f $srcdir/config/${cpu_type}/${cpu_type}-modes.def; then
-  extra_modes_file='$(srcdir)/config/'${cpu_type}/${cpu_type}-modes.def
+if test -n "$extra_modes" && test -f $srcdir/config/$extra_modes; then
+  extra_modes_file='$(srcdir)'/config/${extra_modes}
   
   cat >> confdefs.h <<EOF
-#define EXTRA_MODES_FILE "${cpu_type}/${cpu_type}-modes.def"
+#define EXTRA_MODES_FILE "$extra_modes"
 EOF
 
   cat >> confdefs.h <<\EOF

gcc/configure.in

@@ -870,11 +870,10 @@ if test x$thread_file = x; then
 fi
 
 # Look for a file containing extra machine modes.
-if test -f $srcdir/config/${cpu_type}/${cpu_type}-modes.def; then
-  extra_modes_file='$(srcdir)/config/'${cpu_type}/${cpu_type}-modes.def
+if test -n "$extra_modes" && test -f $srcdir/config/$extra_modes; then
+  extra_modes_file='$(srcdir)'/config/${extra_modes}
   AC_SUBST(extra_modes_file)
-  AC_DEFINE_UNQUOTED(EXTRA_MODES_FILE,
-			   "${cpu_type}/${cpu_type}-modes.def",
+  AC_DEFINE_UNQUOTED(EXTRA_MODES_FILE, "$extra_modes",
   [Define to the name of a file containing a list of extra machine modes
    for this architecture.])
   AC_DEFINE(EXTRA_CC_MODES, 1,