gcc/

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

diff --git a/gcc/errors.c b/gcc/errors.c
index 09504d3..040dfdd 100644 (file)
--- a/gcc/errors.c
+++ b/gcc/errors.c
@@ -1,12 +1,12 @@
 /* Basic error reporting routines.
 /* Basic error reporting routines.

-   Copyright (C) 1999, 2000, 2001, 2003
+   Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2007, 2008

    Free Software Foundation, Inc.
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
    Free Software Foundation, Inc.
 
 This file is part of GCC.
 
 GCC is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free

-Software Foundation; either version 2, or (at your option) any later
+Software Foundation; either version 3, or (at your option) any later

 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY
 version.
 
 GCC is distributed in the hope that it will be useful, but WITHOUT ANY


@@ -15,15 +15,18 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the 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.  */
+along with GCC; see the file COPYING3.  If not see
+<http://www.gnu.org/licenses/>.  */

 
 /* warning, error, and fatal.  These definitions are suitable for use
 
 /* warning, error, and fatal.  These definitions are suitable for use

-   in the generator programs; eventually we would like to use them in
-   cc1 too, but that's a longer term project.  */
+   in the generator programs; the compiler has a more elaborate suite
+   of diagnostic printers, found in diagnostic.c.  */

 
 

+#ifdef GENERATOR_FILE
+#include "bconfig.h"
+#else

 #include "config.h"
 #include "config.h"

+#endif

 #include "system.h"
 #include "errors.h"
 
 #include "system.h"
 #include "errors.h"
 


@@ -101,7 +104,8 @@ internal_error (const char *format, ...)
    shares no directory elements with the pathname of __FILE__.  This
    is used by fancy_abort() to print `Internal compiler error in expr.c'
    instead of `Internal compiler error in ../../GCC/gcc/expr.c'.  This
    shares no directory elements with the pathname of __FILE__.  This
    is used by fancy_abort() to print `Internal compiler error in expr.c'
    instead of `Internal compiler error in ../../GCC/gcc/expr.c'.  This

-   version if for the gen* programs and so needn't handle subdirectories.  */
+   version is meant to be used for the gen* programs and therefor need not
+   handle subdirectories.  */

 
 const char *
 trim_filename (const char *name)
 
 const char *
 trim_filename (const char *name)


@@ -126,5 +130,5 @@ trim_filename (const char *name)
 void
 fancy_abort (const char *file, int line, const char *func)
 {
 void
 fancy_abort (const char *file, int line, const char *func)
 {

-  internal_error ("abort in %s, at %s:%d", func, file, line);
+  internal_error ("abort in %s, at %s:%d", func, trim_filename (file), line);

 }
 }