cpperror.c (_cpp_begin_message): No special casing of CPP_FATAL_LIMIT.

	* cpperror.c (_cpp_begin_message): No special casing
	of CPP_FATAL_LIMIT.
	* cppinit.c (sanity_checks): s/DL_FATAL/DL_ICE/.
	(output_deps, cpp_handle_option, cpp_post_options): Use DL_ERROR.
	* cpplib.c (do_include_common): Use DL_ERROR.
	* cpplib.h (CPP_FATAL_LIMIT, CPP_FATAL_ERRORS, DL_FATAL): Remove.
	(DL_ICE): Renumber.
	* fix-header.c (read_scan_file): Update.

From-SVN: r53765

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 42368e2ab3b018edac00cf4b6de76ac4e5959b51..4dc4f7f3ce1a22768d32e8d964f6bb598393b459 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2002-05-23  Neil Booth  <neil@daikokuya.demon.co.uk>
+
+       * cpperror.c (_cpp_begin_message): No special casing
+       of CPP_FATAL_LIMIT.
+       * cppinit.c (sanity_checks): s/DL_FATAL/DL_ICE/.
+       (output_deps, cpp_handle_option, cpp_post_options): Use DL_ERROR.
+       * cpplib.c (do_include_common): Use DL_ERROR.
+       * cpplib.h (CPP_FATAL_LIMIT, CPP_FATAL_ERRORS, DL_FATAL): Remove.
+       (DL_ICE): Renumber.
+       * fix-header.c (read_scan_file): Update.
+
 2002-05-22  Richard Henderson  <rth@redhat.com>
 
        * config/i386/i386.c (ix86_expand_call): New function, extracted

diff --git a/gcc/cpperror.c b/gcc/cpperror.c
index 5ba7f4d798373c07687fab00795ef3565f84a434..3e6b37c40e9e1e558c34595a970fb0f542389c0c 100644 (file)
--- a/gcc/cpperror.c
+++ b/gcc/cpperror.c
@@ -92,8 +92,7 @@ _cpp_begin_message (pfile, code, line, column)
        {
          if (CPP_OPTION (pfile, inhibit_errors))
            return 0;
-         if (pfile->errors < CPP_FATAL_LIMIT)
-           pfile->errors++;
+         pfile->errors++;
        }
       else if (CPP_OPTION (pfile, inhibit_warnings))
        return 0;
@@ -102,14 +101,9 @@ _cpp_begin_message (pfile, code, line, column)
     case DL_ERROR:
       if (CPP_OPTION (pfile, inhibit_errors))
        return 0;
-      if (pfile->errors < CPP_FATAL_LIMIT)
-       pfile->errors++;
-      break;
-
-      /* Fatal errors cannot be inhibited.  */
-    case DL_FATAL:
+      /* ICEs cannot be inhibited.  */
     case DL_ICE:
-      pfile->errors = CPP_FATAL_LIMIT;
+      pfile->errors++;
       break;
     }
 

diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index fd7c88031aec02d72d931c29883a5230b992e217..55451b578950509c1f347398dd8dc91476644207 100644 (file)
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -845,31 +845,31 @@ static void sanity_checks (pfile)
      type precisions made by cpplib.  */
   test--;
   if (test < 1)
-    cpp_error (pfile, DL_FATAL, "cppchar_t must be an unsigned type");
+    cpp_error (pfile, DL_ICE, "cppchar_t must be an unsigned type");
 
   if (CPP_OPTION (pfile, precision) > BITS_PER_HOST_WIDEST_INT)
-    cpp_error (pfile, DL_FATAL,
+    cpp_error (pfile, DL_ICE,
               "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits",
               (unsigned long)BITS_PER_HOST_WIDEST_INT,
               (unsigned long)CPP_OPTION (pfile, precision));
 
   if (CPP_OPTION (pfile, precision) < CPP_OPTION (pfile, int_precision))
-    cpp_error (pfile, DL_FATAL,
+    cpp_error (pfile, DL_ICE,
               "CPP arithmetic must be at least as precise as a target int");
 
   if (CPP_OPTION (pfile, char_precision) < 8)
-    cpp_error (pfile, DL_FATAL, "target char is less than 8 bits wide");
+    cpp_error (pfile, DL_ICE, "target char is less than 8 bits wide");
 
   if (CPP_OPTION (pfile, wchar_precision) < CPP_OPTION (pfile, char_precision))
-    cpp_error (pfile, DL_FATAL,
+    cpp_error (pfile, DL_ICE,
               "target wchar_t is narrower than target char");
 
   if (CPP_OPTION (pfile, int_precision) < CPP_OPTION (pfile, char_precision))
-    cpp_error (pfile, DL_FATAL,
+    cpp_error (pfile, DL_ICE,
               "target int is narrower than target char");
 
   if (CPP_OPTION (pfile, wchar_precision) > BITS_PER_CPPCHAR_T)
-    cpp_error (pfile, DL_FATAL,
+    cpp_error (pfile, DL_ICE,
               "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits",
               (unsigned long)BITS_PER_CPPCHAR_T,
               (unsigned long)CPP_OPTION (pfile, wchar_precision));
@@ -1061,7 +1061,7 @@ output_deps (pfile)
   if (deps_stream != stdout)
     {
       if (ferror (deps_stream) || fclose (deps_stream) != 0)
-       cpp_error (pfile, DL_FATAL, "I/O error on output");
+       cpp_error (pfile, DL_ERROR, "I/O error on output");
     }
 }
 
@@ -1300,7 +1300,7 @@ cpp_handle_option (pfile, argc, argv, ignore)
       else if (CPP_OPTION (pfile, out_fname) == NULL)
        CPP_OPTION (pfile, out_fname) = argv[i];
       else
-       cpp_error (pfile, DL_FATAL,
+       cpp_error (pfile, DL_ERROR,
                   "too many filenames. Type %s --help for usage info",
                   progname);
     }
@@ -1328,7 +1328,7 @@ cpp_handle_option (pfile, argc, argv, ignore)
              arg = argv[++i];
              if (!arg)
                {
-                 cpp_error (pfile, DL_FATAL,
+                 cpp_error (pfile, DL_ERROR,
                             cl_options[opt_index].msg, argv[i - 1]);
                  return argc;
                }
@@ -1481,7 +1481,7 @@ cpp_handle_option (pfile, argc, argv, ignore)
            CPP_OPTION (pfile, out_fname) = arg;
          else
            {
-             cpp_error (pfile, DL_FATAL, "output filename specified twice");
+             cpp_error (pfile, DL_ERROR, "output filename specified twice");
              return argc;
            }
          break;
@@ -1592,7 +1592,7 @@ cpp_handle_option (pfile, argc, argv, ignore)
                }
              else
                {
-                 cpp_error (pfile, DL_FATAL, "-I- specified twice");
+                 cpp_error (pfile, DL_ERROR, "-I- specified twice");
                  return argc;
                }
            }
@@ -1796,7 +1796,7 @@ cpp_post_options (pfile)
       (CPP_OPTION (pfile, print_deps_missing_files)
        || CPP_OPTION (pfile, deps_file)
        || CPP_OPTION (pfile, deps_phony_targets)))
-    cpp_error (pfile, DL_FATAL,
+    cpp_error (pfile, DL_ERROR,
               "you must additionally specify either -M or -MM");
 }
 

diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index df33af8d00269e95f208a2e6d45a22d8db303d64..ba6924d08ec6f0b009cc6f0c9f659b6242ba38bb 100644 (file)
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -651,7 +651,7 @@ do_include_common (pfile, type)
     {
       /* Prevent #include recursion.  */
       if (pfile->line_maps.depth >= CPP_STACK_MAX)
-       cpp_error (pfile, DL_FATAL, "#include nested too deeply");
+       cpp_error (pfile, DL_ERROR, "#include nested too deeply");
       else
        {
          check_eol (pfile);

diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index 982d0f14eae2affc2027554d15fe3b51a7d7c422..8376e1c16573d379b9d3849564b1b33554caaeaa 100644 (file)
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -420,10 +420,6 @@ struct cpp_callbacks
   void (*register_builtins) PARAMS ((cpp_reader *));
 };
 
-#define CPP_FATAL_LIMIT 1000
-/* True if we have seen a "fatal" error.  */
-#define CPP_FATAL_ERRORS(PFILE) (cpp_errors (PFILE) >= CPP_FATAL_LIMIT)
-
 /* Name under which this program was invoked.  */
 extern const char *progname;
 
@@ -593,13 +589,9 @@ extern int cpp_defined PARAMS ((cpp_reader *, const unsigned char *, int));
 #define DL_PEDWARN             0x02
 /* An error.  */
 #define DL_ERROR               0x03
-/* A fatal error.  We do not exit, to support use of cpplib as a
-   library, but may only return CPP_EOF tokens thereon.  It is the
-   caller's responsibility to check CPP_FATAL_ERRORS.  */
-#define DL_FATAL               0x04
 /* An internal consistency check failed.  Prints "internal error: ",
-   otherwise the same as DL_FATAL.  */
-#define DL_ICE                 0x05
+   otherwise the same as DL_ERROR.  */
+#define DL_ICE                 0x04
 /* Extracts a diagnostic level from an int.  */
 #define DL_EXTRACT(l)          (l & 0xf)
 /* Non-zero if a diagnostic level is one of the warnings.  */

diff --git a/gcc/fix-header.c b/gcc/fix-header.c
index ba4ba6a6dee569eb5ec6de6d9687943cb0509054..0a3e98fb1e6577558764788356e022a9deabc5fd 100644 (file)
--- a/gcc/fix-header.c
+++ b/gcc/fix-header.c
@@ -632,10 +632,10 @@ read_scan_file (in_fname, argc, argv)
   options->inhibit_errors = 1;
 
   i = cpp_handle_options (scan_in, argc, argv);
-  if (i < argc && ! CPP_FATAL_ERRORS (scan_in))
-    cpp_error (scan_in, DL_FATAL, "invalid option `%s'", argv[i]);
+  if (i < argc)
+    cpp_error (scan_in, DL_ERROR, "invalid option `%s'", argv[i]);
   cpp_post_options (scan_in);
-  if (CPP_FATAL_ERRORS (scan_in))
+  if (cpp_errors (scan_in))
     exit (FATAL_EXIT_CODE);
 
   if (! cpp_read_main_file (scan_in, in_fname, NULL))