Makefile.in (PROTO_OBJS): Add errors.o.

	* Makefile.in (PROTO_OBJS): Add errors.o.
	* protoize.c (fancy_abort): Remove.
	* mips-tfile.c (fancy_abort): Add parameters.

From-SVN: r86471

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 00888c0e992f7bdca36311009683437c1727b9bf..005caa11040625f22723ce0020313b252bed95a4 100644 (file)
--- 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Ã\83  <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 0d2db388a99d647d7f933c88ca5ea6ba06cbe349..283c10610024b1ff6f8572e9390c5eac001e54c7 100644 (file)
--- 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 9b333063e34d90c52a617012798ff01d42ee3c14..9b63064a3bdd5d6804754328246a290a9117e540 100644 (file)
--- 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);
 }
 \f
 

diff --git a/gcc/protoize.c b/gcc/protoize.c
index 0dd91e242196ade5e6153c6db70b31d382a67a55..937f21cfbde9be51932f9e6048e771b38dd280e3 100644 (file)
--- 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);
-}
 \f
 /* Make a duplicate of the first N bytes of a given string in a newly
    allocated area.  */