Add new test - do not warn about (non-)redundant friend declaration.

[pf3gnuchains/gcc-fork.git] / gcc / gengenrtl.c

diff --git a/gcc/gengenrtl.c b/gcc/gengenrtl.c
index 535c839..d41e0d2 100644 (file)
--- a/gcc/gengenrtl.c
+++ b/gcc/gengenrtl.c
@@ -98,7 +98,7 @@ struct rtx_definition
   const char *enumname, *name, *format;
 };
 
-#define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS) { STRINGIFY(ENUM), NAME, FORMAT },
+#define DEF_RTL_EXPR(ENUM, NAME, FORMAT, CLASS) { STRINGX(ENUM), NAME, FORMAT },
 
 struct rtx_definition defs[] = 
 {  
@@ -208,6 +208,7 @@ special_rtx (idx)
   return (strcmp (defs[idx].enumname, "CONST_INT") == 0
          || strcmp (defs[idx].enumname, "CONST_DOUBLE") == 0
          || strcmp (defs[idx].enumname, "REG") == 0
+         || strcmp (defs[idx].enumname, "SUBREG") == 0
          || strcmp (defs[idx].enumname, "MEM") == 0);
 }
 
@@ -321,10 +322,7 @@ gendef (format)
      the memory and initializes it.  */
   puts ("{");
   puts ("  rtx rt;");
-  puts ("  if (ggc_p)");
-  printf ("    rt = ggc_alloc_rtx (%d);\n", (int) strlen (format));
-  puts ("  else");
-  printf ("    rt = obstack_alloc_rtx (%d);\n", (int) strlen (format));
+  printf ("  rt = ggc_alloc_rtx (%d);\n", (int) strlen (format));
 
   puts ("  memset (rt, 0, sizeof (struct rtx_def) - sizeof (rtunion));\n");
   puts ("  PUT_CODE (rt, code);");
@@ -354,7 +352,10 @@ genheader ()
 {
   int i;
   const char **fmt;
-  
+
+  puts ("#ifndef GCC_GENRTL_H");
+  puts ("#define GCC_GENRTL_H\n");
+
   for (fmt = formats; *fmt; ++fmt)
     gendecl (*fmt);
 
@@ -363,6 +364,8 @@ genheader ()
   for (i = 0; i < NUM_RTX_CODE; i++)
     if (! special_format (defs[i].format))
       genmacro (i);
+
+  puts ("\n#endif /* GCC_GENRTL_H */");
 }
 
 /* Generate the text of the code file we write, genrtl.c.  */
@@ -392,7 +395,7 @@ PTR
 xmalloc (nbytes)
   size_t nbytes;
 {
-  register PTR tmp = (PTR) malloc (nbytes);
+  register PTR tmp = (PTR) really_call_malloc (nbytes);
 
   if (!tmp)
     {
@@ -423,6 +426,8 @@ main (argc, argv)
   else
     gencode ();
 
-  fflush (stdout);
-  return (ferror (stdout) != 0 ? FATAL_EXIT_CODE : SUCCESS_EXIT_CODE);
+  if (ferror (stdout) || fflush (stdout) || fclose (stdout))
+    return FATAL_EXIT_CODE;
+
+  return SUCCESS_EXIT_CODE;
 }