diff options
| author | Zack Weinberg <zack@wolery.cumb.org> | 2000-07-21 07:10:36 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-07-21 07:10:36 +0000 |
| commit | fbfc11925b971a0d73b7253ba71bef3c32c9fb95 (patch) | |
| tree | d19f337e85d3fb553f6806af5174bc4df981e7c8 /gcc/toplev.h | |
| parent | 1b493b8185a04b875c99c0dc4ef63005bb5fc54b (diff) | |
| download | gcc-fbfc11925b971a0d73b7253ba71bef3c32c9fb95.zip gcc-fbfc11925b971a0d73b7253ba71bef3c32c9fb95.tar.gz gcc-fbfc11925b971a0d73b7253ba71bef3c32c9fb95.tar.bz2 | |
diagnostic.c (trim_filename, [...]): Moved here from rtl.c.
* diagnostic.c (trim_filename, fancy_abort): Moved here from
rtl.c.
(fatal_function, set_fatal_function): Removed.
(fatal): Don't prepare for or call the fatal_function.
(diagnostic_lock, error_recursion): New.
(diagnostic_for_decl, report_diagnostic): Guard against
re-entering the error reporting routines.
(fancy_abort): Assume function is not NULL.
* errors.c (fancy_abort): New. Assume function is not NULL.
* tradcpp.c (fancy_abort): Assume function is not NULL.
* system.h: Provide default definition of __FUNCTION__.
* rtl.h: Use __FUNCTION__ not __PRETTY_FUNCTION__ throughout.
Always use __FUNCTION__ in definition of abort.
* tree.h: Likewise.
* varray.h: Likewise.
* toplev.h: Likewise. Don't prototype set_fatal_function.
From-SVN: r35170
Diffstat (limited to 'gcc/toplev.h')
| -rw-r--r-- | gcc/toplev.h | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/gcc/toplev.h b/gcc/toplev.h index 952d363..d61c5bf 100644 --- a/gcc/toplev.h +++ b/gcc/toplev.h @@ -57,17 +57,11 @@ extern void _fatal_insn PARAMS ((const char *, const char *)) ATTRIBUTE_NORETURN; -#if (GCC_VERSION >= 2007) #define fatal_insn(msgid, insn) \ - _fatal_insn (msgid, insn, __FILE__, __LINE__, __PRETTY_FUNCTION__) + _fatal_insn (msgid, insn, __FILE__, __LINE__, __FUNCTION__) #define fatal_insn_not_found(insn) \ - _fatal_insn_not_found (insn, __FILE__, __LINE__, __PRETTY_FUNCTION__) -#else -#define fatal_insn(msgid, insn) \ - _fatal_insn (msgid, insn, __FILE__, __LINE__, 0) -#define fatal_insn_not_found(insn) \ - _fatal_insn_not_found (insn, __FILE__, __LINE__, 0) -#endif + _fatal_insn_not_found (insn, __FILE__, __LINE__, __FUNCTION__) + extern void warning PARAMS ((const char *, ...)) ATTRIBUTE_PRINTF_1; extern void error PARAMS ((const char *, ...)) @@ -140,5 +134,4 @@ extern int sorrycount; extern const char *progname; -extern void set_fatal_function PARAMS ((void (*) (const char *, va_list))); #endif /* __GCC_TOPLEV_H */ |