diff options
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/Makefile.in | 2 | ||||
| -rw-r--r-- | gcc/mips-tfile.c | 8 | ||||
| -rw-r--r-- | gcc/protoize.c | 10 |
4 files changed, 11 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 00888c0..005caa1 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2004-08-24 Nathan Sidwell <nathan@codesourcery.com> + + * Makefile.in (PROTO_OBJS): Add errors.o. + * protoize.c (fancy_abort): Remove. + * mips-tfile.c (fancy_abort): Add parameters. + 2004-08-24 Jonathan Wakely <redi@gcc.gnu.org> * doc/trouble.texi (C++ misunderstandings): Fix example code. @@ -3318,7 +3324,7 @@ * config/i386/xmmintrin.h: Include <mm_malloc.h>. 2004-08-03 H.J. Lu <hongjiu.lu@intel.com> - Tanguy Fautrà <tfautre@pandora.be> + Tanguy Fautrà <tfautre@pandora.be> * config/i386/pmm_malloc.h: New file. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index 0d2db38..283c106 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -2635,7 +2635,7 @@ cppdefault.o: cppdefault.c $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) \ proto: config.status protoize$(exeext) unprotoize$(exeext) SYSCALLS.c.X -PROTO_OBJS = intl.o version.o cppdefault.o +PROTO_OBJS = intl.o version.o cppdefault.o errors.o protoize$(exeext): protoize.o $(PROTO_OBJS) $(LIBDEPS) $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ protoize.o $(PROTO_OBJS) $(LIBS) diff --git a/gcc/mips-tfile.c b/gcc/mips-tfile.c index 9b33306..9b63064 100644 --- a/gcc/mips-tfile.c +++ b/gcc/mips-tfile.c @@ -637,7 +637,6 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA so they can't be static. */ extern void pfatal_with_name (const char *) ATTRIBUTE_NORETURN; -extern void fancy_abort (void) ATTRIBUTE_NORETURN; extern void botch (const char *) ATTRIBUTE_NORETURN; extern void fatal (const char *format, ...) ATTRIBUTE_PRINTF_1 ATTRIBUTE_NORETURN; @@ -5471,13 +5470,12 @@ error (const char *format, ...) saber_stop (); } -/* More 'friendly' abort that prints the line and file. - config.h can #define abort fancy_abort if you like that sort of thing. */ +/* More 'friendly' abort that prints the line and file. */ void -fancy_abort (void) +fancy_abort (const char *file, int line, const char *func) { - fatal ("internal abort"); + fatal ("abort in %s, at %s:%d", func, file, line); } diff --git a/gcc/protoize.c b/gcc/protoize.c index 0dd91e2..937f21c 100644 --- a/gcc/protoize.c +++ b/gcc/protoize.c @@ -75,7 +75,6 @@ static void usage (void) ATTRIBUTE_NORETURN; static void aux_info_corrupted (void) ATTRIBUTE_NORETURN; static void declare_source_confusing (const char *) ATTRIBUTE_NORETURN; static const char *shortpath (const char *, const char *); -extern void fancy_abort (void) ATTRIBUTE_NORETURN; static void notice (const char *, ...) ATTRIBUTE_PRINTF_1; static char *savestring (const char *, unsigned int); static char *dupnstr (const char *, size_t); @@ -525,15 +524,6 @@ savestring (const char *input, unsigned int size) return output; } -/* More 'friendly' abort that prints the line and file. - config.h can #define abort fancy_abort if you like that sort of thing. */ - -void -fancy_abort (void) -{ - notice ("%s: internal abort\n", pname); - exit (FATAL_EXIT_CODE); -} /* Make a duplicate of the first N bytes of a given string in a newly allocated area. */ |