diff options
| author | Zack Weinberg <zack@bitmover.com> | 1999-08-26 05:18:44 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 1999-08-26 05:18:44 +0000 |
| commit | 987009bf0d31f2aa399cbf58ddf91a90b09848ca (patch) | |
| tree | d44a531d6d8a1d3b4f321e6fc43e9e6dbb2f1277 /gcc/toplev.h | |
| parent | f18a14bcc121ed9812ecba53b3a458ed3d16953f (diff) | |
| download | gcc-987009bf0d31f2aa399cbf58ddf91a90b09848ca.zip gcc-987009bf0d31f2aa399cbf58ddf91a90b09848ca.tar.gz gcc-987009bf0d31f2aa399cbf58ddf91a90b09848ca.tar.bz2 | |
system.h: Don't redefine abort or trim_filename.
1999-08-25 22:10 -0700 Zack Weinberg <zack@bitmover.com>
* system.h: Don't redefine abort or trim_filename.
* rtl.h: Define abort to fancy_abort (__FILE__, __LINE__, 0)
or fancy_abort (__FILE__, __LINE__, __FUNCTION__) depending on
whether or not __FUNCTION__ is available.
* tree.h: Duplicate rtl.h's definition of abort, for files
that don't include rtl.h. Delete all code to perform type
checking with a compiler other than GCC.
* varray.h: Delete all code to perform type checking with a
compiler other than GCC. Make VARRAY_CHECK() always evaluate
its arguments exactly once, using a statement expression.
Adjust the VARRAY_<type> accessor macros to match.
* toplev.h (fatal_insn, fatal_insn_not_found): Kill.
(_fatal_insn, _fatal_insn_not_found): New fns, take info on
caller's location. Define fatal_insn and fatal_insn_not_found
as macros that use _fatal_insn and _fatal_insn_not_found.
(fancy_abort, trim_filename): Kill prototypes.
* rtl.c (trim_filename): Move here from toplev.c.
(fancy_abort): New function.
(DIR_SEPARATOR): Provide default definition.
* tree.c (tree_check_failed, tree_class_check_failed): Go
through fancy_abort.
(tree_check, tree_class_check, cst_or_constructor_check,
expr_check): Delete.
* varray.c (varray_check_failed): New function.
* toplev.c (fatal_insn, fatal_insn_not_found): Replace with
_fatal_insn and _fatal_insn_not_found. Go through
fancy_abort.
(trim_filename, fancy_abort): Delete.
* builtins.c (expand_builtin_args_info): Report ICE with abort.
* except.c (start_catch_handler): Report ICE with error/abort
combo.
* final.c (output_operand_lossage): Likewise.
* flow.c (verify_flow_info): Likewise.
* gcc.c: Prototype fatal.
* gengenrtl.c: Undef abort after including rtl.h not system.h.
* genattr.c, genattrtab.c, genemit.c, genextract.c,
genflags.c, genopinit.c, genoutput.c, genpeep.c, genrecog.c:
Don't define fancy_abort.
From-SVN: r28889
Diffstat (limited to 'gcc/toplev.h')
| -rw-r--r-- | gcc/toplev.h | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/gcc/toplev.h b/gcc/toplev.h index 49adb41..3008098 100644 --- a/gcc/toplev.h +++ b/gcc/toplev.h @@ -41,11 +41,27 @@ extern void fatal_io_error PROTO ((const char *)) ATTRIBUTE_NORETURN; extern void pfatal_with_name PROTO ((const char *)) ATTRIBUTE_NORETURN; -extern void fatal_insn_not_found PROTO ((struct rtx_def *)) +extern void _fatal_insn_not_found PROTO ((struct rtx_def *, + const char *, int, + const char *)) ATTRIBUTE_NORETURN; -extern void fatal_insn PVPROTO ((const char *, - struct rtx_def *, ...)) - ATTRIBUTE_PRINTF(1, 3) ATTRIBUTE_NORETURN; +extern void _fatal_insn PROTO ((const char *, + struct rtx_def *, + const char *, int, + const char *)) + ATTRIBUTE_NORETURN; + +#if defined __GNUC__ && (__GNUC__ > 2 || __GNUC_MINOR__ > 6) +#define fatal_insn(msgid, insn) \ + _fatal_insn (msgid, insn, __FILE__, __LINE__, __PRETTY_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 extern void warning PVPROTO ((const char *, ...)) ATTRIBUTE_PRINTF_1; extern void error PVPROTO ((const char *, ...)) @@ -100,8 +116,6 @@ extern int do_float_handler PROTO((void (*) (PTR), PTR)); extern void output_quoted_string PROTO ((FILE *, const char *)); extern void output_file_directive PROTO ((FILE *, const char *)); #endif - -extern void fancy_abort PROTO ((void)) ATTRIBUTE_NORETURN; extern void do_abort PROTO ((void)) ATTRIBUTE_NORETURN; extern void botch PROTO ((const char *)) ATTRIBUTE_NORETURN; @@ -111,8 +125,6 @@ extern void fnotice PROTO ((FILE *, const char *, ...)) ATTRIBUTE_PRINTF_2; #endif -#undef trim_filename -extern const char *trim_filename PROTO ((const char *)); extern int wrapup_global_declarations PROTO ((union tree_node **, int)); extern void check_global_declarations PROTO ((union tree_node **, int)); extern int errorcount; |