* 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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54540 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5b18311..b3ec121 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,16 +1,24 @@
+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
-        max/mins as unsigned GE compares.
+       * config/rs6000/rs6000.c (rs6000_emit_minmax): Treat unsigned
+       max/mins as unsigned GE compares.
 
 2002-06-11  Jason Thorpe  <thorpej@wasabisystems.com>
 
-       * config.gcc (vax-*-bsd*): Add vax/bsd.h to ${tm_file}. 
+       * config.gcc (vax-*-bsd*): Add vax/bsd.h to ${tm_file}.
        * config/vax/bsd.h: New file.
        * config/vax/netbsd.h: Add missing notice.
-       (CPP_PREDEFINES): Remove.  
-       (TARGET_OS_CPP_BUILTINS): Define.  
-       (CPP_SPEC): Use NETBSD_CPP_SPEC.   
+       (CPP_PREDEFINES): Remove.
+       (TARGET_OS_CPP_BUILTINS): Define.
+       (CPP_SPEC): Use NETBSD_CPP_SPEC.
        * config/vax/openbsd.h: Update copyright years.
        (CPP_PREDEFINES): Remove.
        (TARGET_OS_CPP_BUILTINS): Define.
@@ -97,7 +105,7 @@ Wed Jun 12 01:50:28 CEST 2002  Jan Hubicka  <jh@suse.cz>
        match semantics.
        * diagnostic.c: Adjust calls to diagnostic_count_error through out.
        (diagnostic_count_diagnostic): Make aware of other kinds of
-       diagnostics. 
+       diagnostics.
        (diagnostic_initialize): Initialize warnings_are_errors_message field.
 
 2002-06-11  Tom Tromey  <tromey@redhat.com>
@@ -115,7 +123,7 @@ Wed Jun 12 01:50:28 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
 2002-06-11  Richard Henderson  <rth@redhat.com>
 
-       * defaults.h (EH_FRAME_SECTION_NAME): Don't define if 
+       * defaults.h (EH_FRAME_SECTION_NAME): Don't define if
        DWARF2_UNWIND_INFO is false.
 
 2002-06-11  Bob Wilson  <bob.wilson@acm.org>
@@ -181,19 +189,19 @@ Tue Jun 11 21:53:37 CEST 2002  Jan Hubicka  <jh@suse.cz>
 2002-06-11  Ulrich Weigand  <uweigand@de.ibm.com>
 
        * config/s390/s390.md (reload_base, ltorg): Remove.
-       * s390.c (s390_stop_dump_lit_p, s390_dump_literal_pool, 
+       * s390.c (s390_stop_dump_lit_p, s390_dump_literal_pool,
        s390_asm_output_pool_prologue, s390_pool_start_insn): Remove.
-       * s390-protos.h (s390_stop_dump_lit_p, s390_dump_literal_pool, 
+       * s390-protos.h (s390_stop_dump_lit_p, s390_dump_literal_pool,
        s390_asm_output_pool_prologue): Likewise.
        * s390.h (s390_pool_start_insn): Likewise.
 
-       * s390.c (s390_output_symbolic_const): Remove support for 
+       * s390.c (s390_output_symbolic_const): Remove support for
        old-style pool chunks.
        (s390_function_epilogue): Likewise.
-       (s390_output_constant_pool): Likewise.  Also, fix incorrect 
+       (s390_output_constant_pool): Likewise.  Also, fix incorrect
        alignment for 64-bit literal pools.
        (print_operand_address): Remove 'y' and 'Y' format flags.
-       * s390.h (ASM_OUTPUT_POOL_PROLOGUE): Remove support for 
+       * s390.h (ASM_OUTPUT_POOL_PROLOGUE): Remove support for
        old-style pool chunks.
        (ASM_OUTPUT_SPECIAL_POOL_ENTRY): Likewise.
        (ASM_OUTPUT_POOL_EPILOGUE): Remove.
@@ -202,23 +210,23 @@ Tue Jun 11 21:53:37 CEST 2002  Jan Hubicka  <jh@suse.cz>
        * s390.c (consttable_operand): New function.
        * s390-protos.h (consttable_operand): Declare it.
        * s390.h (PREDICATE_CODES): Add consttable_operand.
-       * s390.md (consttable_qi, consttable_hi, consttable_si, consttable_di, 
-       consttable_sf, consttable_df, pool_start_31, pool_end_31, 
+       * s390.md (consttable_qi, consttable_hi, consttable_si, consttable_di,
+       consttable_sf, consttable_df, pool_start_31, pool_end_31,
        pool_start_64, pool_end_64, reload_base, reload_base2): New insns.
        * s390.c (struct constant, struct constant_pool): New data types.
        (constant_modes, gen_consttable): New variables.
-       (s390_start_pool, s390_end_pool, s390_add_pool, 
+       (s390_start_pool, s390_end_pool, s390_add_pool,
        s390_dump_pool, s390_free_pool): New functions.
-       (s390_chunkify_pool): Completely reimplement literal pool 
+       (s390_chunkify_pool): Completely reimplement literal pool
        overflow handling.
 
        * s390.c (s390_pool_overflow): New variable.
        * s390.h (s390_pool_overflow): Declare it.
-       * s390.md (cjump, icjump): Use it to adapt length for out-of-range 
+       * s390.md (cjump, icjump): Use it to adapt length for out-of-range
        jumps in literal pool overflow situations.
 
        * s390.c (s390_decompose_address): Accept new-style pool chunk offsets.
-       (s390_frame_info): Account for possible use of RETURN_REGNUM 
+       (s390_frame_info): Account for possible use of RETURN_REGNUM
        by new literal pool overflow code.
        (s390_emit_prologue): Likewise.
 
@@ -340,7 +348,7 @@ Tue Jun 11 21:53:37 CEST 2002  Jan Hubicka  <jh@suse.cz>
        * combine.c (try_combine): Expect insn lists from split generator.
        * reorg.c (relax_delay_slots): Emit SEQUENCE into insn list by
        hand.
-       
+
 2002-06-11  Roger Sayle  <roger@eyesopen.com>
            Andreas Jaeger <aj@suse.de>
 
@@ -348,7 +356,7 @@ Tue Jun 11 21:53:37 CEST 2002  Jan Hubicka  <jh@suse.cz>
 
 2002-06-11  Andreas Schwab  <schwab@suse.de>
 
-       * config/m68k/m68k.h (PREDICATE_CODES): Define. 
+       * config/m68k/m68k.h (PREDICATE_CODES): Define.
 
 2002-06-11  Eric Christopher  <echristo@redhat.com>
 
@@ -690,7 +698,7 @@ Mon Jun 10 18:02:24 2002  J"orn Rennecke <joern.rennecke@superh.com>
 
 2002-06-10  Tim Josling  <tej@melbpc.org.au>
 
-         First steps to making treelang documentation compliant, based on
+        First steps to making treelang documentation compliant, based on
         instructions in sourcebuild.texi. Also add to gcc.c list of
         default languages.
 

diff --git a/gcc/config.gcc b/gcc/config.gcc
index 4868f46..655e7fd 100644 (file)
--- a/gcc/config.gcc
+++ b/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'.

diff --git a/gcc/configure b/gcc/configure
index f3fb447..07637d6 100755 (executable)
--- a/gcc/configure
+++ b/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

diff --git a/gcc/configure.in b/gcc/configure.in
index 418fba7..00b33c7 100644 (file)
--- a/gcc/configure.in
+++ b/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,