OSDN Git Service
(root)
/
pf3gnuchains
/
gcc-fork.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* fold-const.c (fold_binary): Correct warning for X - c >= X.
[pf3gnuchains/gcc-fork.git]
/
gcc
/
errors.c
diff --git
a/gcc/errors.c
b/gcc/errors.c
index
4147b3f
..
ab5e2a8
100644
(file)
--- a/
gcc/errors.c
+++ b/
gcc/errors.c
@@
-1,5
+1,6
@@
/* Basic error reporting routines.
/* Basic error reporting routines.
- Copyright (C) 1999, 2000, 2001 Free Software Foundation, Inc.
+ Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005
+ Free Software Foundation, Inc.
This file is part of GCC.
This file is part of GCC.
@@
-15,17
+16,19
@@
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
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, 5
9 Temple Place - Suite 330
, Boston, MA
-0211
1-1307
, USA. */
+Software Foundation, 5
1 Franklin Street, Fifth Floor
, Boston, MA
+0211
0-1301
, USA. */
/* 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 "system.h"
-#include "coretypes.h"
-#include "tm.h"
#include "errors.h"
/* Set this to argv[0] at the beginning of main. */
#include "errors.h"
/* Set this to argv[0] at the beginning of main. */
@@
-39,10
+42,10
@@
int have_error = 0;
/* Print a warning message - output produced, but there may be problems. */
void
/* Print a warning message - output produced, but there may be problems. */
void
-warning (const char *format, ...)
+warning (
int opt ATTRIBUTE_UNUSED,
const char *format, ...)
{
va_list ap;
{
va_list ap;
-
+
va_start (ap, format);
fprintf (stderr, "%s: warning: ", progname);
vfprintf (stderr, format, ap);
va_start (ap, format);
fprintf (stderr, "%s: warning: ", progname);
vfprintf (stderr, format, ap);
@@
-57,7
+60,7
@@
void
error (const char *format, ...)
{
va_list ap;
error (const char *format, ...)
{
va_list ap;
-
+
va_start (ap, format);
fprintf (stderr, "%s: ", progname);
vfprintf (stderr, format, ap);
va_start (ap, format);
fprintf (stderr, "%s: ", progname);
vfprintf (stderr, format, ap);
@@
-74,7
+77,7
@@
void
fatal (const char *format, ...)
{
va_list ap;
fatal (const char *format, ...)
{
va_list ap;
-
+
va_start (ap, format);
fprintf (stderr, "%s: ", progname);
vfprintf (stderr, format, ap);
va_start (ap, format);
fprintf (stderr, "%s: ", progname);
vfprintf (stderr, format, ap);
@@
-89,7
+92,7
@@
void
internal_error (const char *format, ...)
{
va_list ap;
internal_error (const char *format, ...)
{
va_list ap;
-
+
va_start (ap, format);
fprintf (stderr, "%s: Internal error: ", progname);
vfprintf (stderr, format, ap);
va_start (ap, format);
fprintf (stderr, "%s: Internal error: ", progname);
vfprintf (stderr, format, ap);
@@
-105,8
+108,7
@@
internal_error (const char *format, ...)
version if for the gen* programs and so needn't handle subdirectories. */
const char *
version if for the gen* programs and so needn't handle subdirectories. */
const char *
-trim_filename (name)
- const char *name;
+trim_filename (const char *name)
{
static const char this_file[] = __FILE__;
const char *p = name, *q = this_file;
{
static const char this_file[] = __FILE__;
const char *p = name, *q = this_file;
@@
-116,11
+118,7
@@
trim_filename (name)
p++, q++;
/* Now go backwards until the previous directory separator. */
p++, q++;
/* Now go backwards until the previous directory separator. */
- while (p > name && p[-1] != DIR_SEPARATOR
-#ifdef DIR_SEPARATOR_2
- && p[-1] != DIR_SEPARATOR_2
-#endif
- )
+ while (p > name && !IS_DIR_SEPARATOR (p[-1]))
p--;
return p;
p--;
return p;
@@
-130,10
+128,7
@@
trim_filename (name)
This file is used only by build programs, so we're not as polite as
the version in diagnostic.c. */
void
This file is used only by build programs, so we're not as polite as
the version in diagnostic.c. */
void
-fancy_abort (file, line, func)
- const char *file;
- int line;
- const char *func;
+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);
}
}