diagnostic.c (internal_error): Say "confused" after 1 error, not two.

        * diagnostic.c (internal_error): Say "confused" after 1 error, not
        two.  Print file and line with "confused" message.

From-SVN: r39543

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e8a9876fe7fa57923e86d661ba896eb09cfdbe4a..8fb27ca76c4afe60cb017e864fea2999602f2844 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 2001-02-08  Jason Merrill  <jason@redhat.com>
 
+       * diagnostic.c (internal_error): Say "confused" after 1 error, not
+       two.  Print file and line with "confused" message.
+
        * dwarf2out.c (dwarf2out_line): Include filename in -dA output.
 
 Thu Feb  8 11:21:28 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>

diff --git a/gcc/diagnostic.c b/gcc/diagnostic.c
index 2dccd4c8b0d9f140cb645b67fd09ad7eac21f886..11039403e27f81e3451dcd1266a2609efcfc5eff 100644 (file)
--- a/gcc/diagnostic.c
+++ b/gcc/diagnostic.c
@@ -1456,9 +1456,10 @@ internal_error VPARAMS ((const char *msgid, ...))
   msgid = va_arg (ap, const char *);
 #endif
 
-  if (errorcount > 1 || sorrycount > 0)
+  if (errorcount > 0 || sorrycount > 0)
     {
-      fprintf (stderr, "confused by earlier errors, bailing out\n");
+      fprintf (stderr, "%s:%d: confused by earlier errors, bailing out\n",
+              input_filename, lineno);
       exit (FATAL_EXIT_CODE);
     }