GCC 4.2.0 release.

1 files changed, 8 insertions, 20 deletions

diff --git a/contrib/gcc/genconstants.c b/contrib/gcc/genconstants.c
index a49c547..1a63c66 100644
--- a/contrib/gcc/genconstants.c
+++ b/contrib/gcc/genconstants.c
@@ -2,7 +2,7 @@
    a series of #define statements, one for each constant named in
    a (define_constants ...) pattern.
 
-   Copyright (C) 1987, 1991, 1995, 1998, 1999, 2000, 2001, 2003
+   Copyright (C) 1987, 1991, 1995, 1998, 1999, 2000, 2001, 2003, 2004
    Free Software Foundation, Inc.
 
 This file is part of GCC.
@@ -19,8 +19,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GCC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 /* This program does not use gensupport.c because it does not need to
    look at insn patterns, only (define_constants), and we want to
@@ -34,16 +34,14 @@ Boston, MA 02111-1307, USA.  */
 #include "errors.h"
 #include "gensupport.h"
 
-static int print_md_constant (void **, void *);
-
 /* Called via traverse_md_constants; emit a #define for
    the current constant definition.  */
 
 static int
 print_md_constant (void **slot, void *info)
 {
-  struct md_constant *def = *slot;
-  FILE *file = info;
+  struct md_constant *def = (struct md_constant *) *slot;
+  FILE *file = (FILE *) info;
 
   fprintf (file, "#define %s %s\n", def->name, def->value);
   return 1;
@@ -52,22 +50,13 @@ print_md_constant (void **slot, void *info)
 int
 main (int argc, char **argv)
 {
-  int dummy1, dummy2;
-  rtx desc;
-
   progname = "genconstants";
 
-  if (argc <= 1)
-    fatal ("no input file name");
-
-  if (init_md_reader (argv[1]) != SUCCESS_EXIT_CODE)
+  if (init_md_reader_args (argc, argv) != SUCCESS_EXIT_CODE)
     return (FATAL_EXIT_CODE);
 
-  /* Scan and discard the entire file.  This has the side effect
-     of loading up the constants table that we wish to scan.  */
-  do
-    desc = read_md_rtx (&dummy1, &dummy2);
-  while (desc);
+  /* Initializing the MD reader has the side effect of loading up
+     the constants table that we wish to scan.  */
 
   puts ("/* Generated automatically by the program `genconstants'");
   puts ("   from the machine description file `md'.  */\n");
@@ -83,4 +72,3 @@ main (int argc, char **argv)
 
   return SUCCESS_EXIT_CODE;
 }
-