PR fortran/32049

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

diff --git a/gcc/genemit.c b/gcc/genemit.c
index e0e4836..fbf1344 100644 (file)
--- a/gcc/genemit.c
+++ b/gcc/genemit.c
@@ -399,7 +399,7 @@ gen_insn (rtx insn, int lineno)
   if (XSTR (insn, 0)[0] == 0 || XSTR (insn, 0)[0] == '*')
     return;
 
-  printf ("/* %s:%d */\n", read_rtx_filename, lineno);
+  printf ("/* %s:%d */\n", read_md_filename, lineno);
 
   /* Find out how many operands this function has.  */
   operands = max_operand_vec (insn, 1);
@@ -514,7 +514,7 @@ gen_expand (rtx expand)
 
       /* Output the special code to be executed before the sequence
         is generated.  */
-      print_rtx_ptr_loc (XSTR (expand, 3));
+      print_md_ptr_loc (XSTR (expand, 3));
       printf ("%s\n", XSTR (expand, 3));
 
       /* Output code to copy the arguments back out of `operands'
@@ -643,7 +643,7 @@ gen_split (rtx split)
 
   if (XSTR (split, 3))
     {
-      print_rtx_ptr_loc (XSTR (split, 3));
+      print_md_ptr_loc (XSTR (split, 3));
       printf ("%s\n", XSTR (split, 3));
     }
 
@@ -833,7 +833,7 @@ main (int argc, char **argv)
 
   progname = "genemit";
 
-  if (init_md_reader_args (argc, argv) != SUCCESS_EXIT_CODE)
+  if (!init_rtx_reader_args (argc, argv))
     return (FATAL_EXIT_CODE);
 
   /* Assign sequential codes to all entries in the machine description
@@ -862,6 +862,7 @@ from the machine description file `md'.  */\n\n");
   printf ("#include \"recog.h\"\n");
   printf ("#include \"resource.h\"\n");
   printf ("#include \"reload.h\"\n");
+  printf ("#include \"diagnostic-core.h\"\n");
   printf ("#include \"toplev.h\"\n");
   printf ("#include \"regs.h\"\n");
   printf ("#include \"tm-constrs.h\"\n");
@@ -888,17 +889,17 @@ from the machine description file `md'.  */\n\n");
          break;
 
        case DEFINE_EXPAND:
-         printf ("/* %s:%d */\n", read_rtx_filename, line_no);
+         printf ("/* %s:%d */\n", read_md_filename, line_no);
          gen_expand (desc);
          break;
 
        case DEFINE_SPLIT:
-         printf ("/* %s:%d */\n", read_rtx_filename, line_no);
+         printf ("/* %s:%d */\n", read_md_filename, line_no);
          gen_split (desc);
          break;
 
        case DEFINE_PEEPHOLE2:
-         printf ("/* %s:%d */\n", read_rtx_filename, line_no);
+         printf ("/* %s:%d */\n", read_md_filename, line_no);
          gen_split (desc);
          break;