From fa6e459ce5f49ba33b4eea1f45038844c06977b3 Mon Sep 17 00:00:00 2001
From: Peter Johnson <peter@tortall.net>
Date: Sun, 16 Sep 2001 05:39:35 +0000
Subject: [PATCH] Use abort() instead of exit() if it's available for
 InternalError() and Fatal().

svn path=/trunk/yasm/; revision=158
---
 configure.ac      |  2 +-
 configure.in      |  2 +-
 libyasm/errwarn.c | 12 ++++++++++--
 src/errwarn.c     | 12 ++++++++++--
 4 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index b42dbee9..8e4e11e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_C_CONST
 AC_TYPE_SIZE_T
 
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(memcpy toascii)
+AC_CHECK_FUNCS(memcpy toascii abort)
 AC_REPLACE_FUNCS(strdup strtoul)
 
 AC_CHECK_HEADERS(limits.h sys/queue.h sys/cdefs.h)
diff --git a/configure.in b/configure.in
index b42dbee9..8e4e11e5 100644
--- a/configure.in
+++ b/configure.in
@@ -31,7 +31,7 @@ AC_C_CONST
 AC_TYPE_SIZE_T
 
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(memcpy toascii)
+AC_CHECK_FUNCS(memcpy toascii abort)
 AC_REPLACE_FUNCS(strdup strtoul)
 
 AC_CHECK_HEADERS(limits.h sys/queue.h sys/cdefs.h)
diff --git a/libyasm/errwarn.c b/libyasm/errwarn.c
index 63f25929..83a54ab8 100644
--- a/libyasm/errwarn.c
+++ b/libyasm/errwarn.c
@@ -1,4 +1,4 @@
-/* $Id: errwarn.c,v 1.23 2001/08/30 03:45:26 peter Exp $
+/* $Id: errwarn.c,v 1.24 2001/09/16 05:39:35 peter Exp $
  * Error and warning reporting and related functions.
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -45,7 +45,7 @@
 #include "globals.h"
 #include "errwarn.h"
 
-RCSID("$Id: errwarn.c,v 1.23 2001/08/30 03:45:26 peter Exp $");
+RCSID("$Id: errwarn.c,v 1.24 2001/09/16 05:39:35 peter Exp $");
 
 /* Total error count for entire assembler run.
  * Assembler should exit with EXIT_FAILURE if this is >= 0 on finish. */
@@ -126,7 +126,11 @@ InternalError(unsigned int line, char *file, char *message)
 {
     fprintf(stderr, _("INTERNAL ERROR at %s, line %d: %s\n"), file, line,
 	    message);
+#ifdef HAVE_ABORT
+    abort();
+#else
     exit(EXIT_FAILURE);
+#endif
 }
 
 /* Report a fatal error.  These are unrecoverable (such as running out of
@@ -135,7 +139,11 @@ void
 Fatal(fatal_num num)
 {
     fprintf(stderr, "%s %s\n", _("FATAL:"), gettext(fatal_msgs[num]));
+#ifdef HAVE_ABORT
+    abort();
+#else
     exit(EXIT_FAILURE);
+#endif
 }
 
 /* Register an error.  Uses argtypes as described above to specify the
diff --git a/src/errwarn.c b/src/errwarn.c
index 63f25929..83a54ab8 100644
--- a/src/errwarn.c
+++ b/src/errwarn.c
@@ -1,4 +1,4 @@
-/* $Id: errwarn.c,v 1.23 2001/08/30 03:45:26 peter Exp $
+/* $Id: errwarn.c,v 1.24 2001/09/16 05:39:35 peter Exp $
  * Error and warning reporting and related functions.
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -45,7 +45,7 @@
 #include "globals.h"
 #include "errwarn.h"
 
-RCSID("$Id: errwarn.c,v 1.23 2001/08/30 03:45:26 peter Exp $");
+RCSID("$Id: errwarn.c,v 1.24 2001/09/16 05:39:35 peter Exp $");
 
 /* Total error count for entire assembler run.
  * Assembler should exit with EXIT_FAILURE if this is >= 0 on finish. */
@@ -126,7 +126,11 @@ InternalError(unsigned int line, char *file, char *message)
 {
     fprintf(stderr, _("INTERNAL ERROR at %s, line %d: %s\n"), file, line,
 	    message);
+#ifdef HAVE_ABORT
+    abort();
+#else
     exit(EXIT_FAILURE);
+#endif
 }
 
 /* Report a fatal error.  These are unrecoverable (such as running out of
@@ -135,7 +139,11 @@ void
 Fatal(fatal_num num)
 {
     fprintf(stderr, "%s %s\n", _("FATAL:"), gettext(fatal_msgs[num]));
+#ifdef HAVE_ABORT
+    abort();
+#else
     exit(EXIT_FAILURE);
+#endif
 }
 
 /* Register an error.  Uses argtypes as described above to specify the