From f75e8946181b3a03c3be433ff05a51d79c921aaf Mon Sep 17 00:00:00 2001
From: Jason Merrill <jason@yorick.cygnus.com>
Date: Fri, 17 Sep 1999 18:37:48 +0000
Subject: [PATCH] libgcc2.c (L_exit): Check for ON_EXIT, not HAVE_ON_EXIT.

	* libgcc2.c (L_exit): Check for ON_EXIT, not HAVE_ON_EXIT.
	* sparc/sunos4.h (HAVE_ON_EXIT): Remove.

From-SVN: r29481
---
 gcc/ChangeLog             | 3 +++
 gcc/config/sparc/sunos4.h | 1 -
 gcc/libgcc2.c             | 6 +++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8860f6cc835..fcf41bdc79f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,8 @@
 Fri Sep 17 11:14:17 1999  Jason Merrill  <jason@yorick.cygnus.com>
 
+	* libgcc2.c (L_exit): Check for ON_EXIT, not HAVE_ON_EXIT.
+	* sparc/sunos4.h (HAVE_ON_EXIT): Remove.
+
 	* tlink.c (scan_linker_output): Look for keywords before accepting
 	a mangled name in quotes.
 
diff --git a/gcc/config/sparc/sunos4.h b/gcc/config/sparc/sunos4.h
index 45d59fb585d..825df093a93 100644
--- a/gcc/config/sparc/sunos4.h
+++ b/gcc/config/sparc/sunos4.h
@@ -53,4 +53,3 @@ Boston, MA 02111-1307, USA.  */
 extern int on_exit PARAMS ((void *, void *));
 #define ON_EXIT(FUNC) on_exit ((FUNC), 0)
 #define NEED_ATEXIT
-#define HAVE_ON_EXIT
diff --git a/gcc/libgcc2.c b/gcc/libgcc2.c
index a27caa358fe..6e1742ee6d5 100644
--- a/gcc/libgcc2.c
+++ b/gcc/libgcc2.c
@@ -2931,7 +2931,7 @@ func_ptr __DTOR_LIST__[2];
 
 #ifdef NEED_ATEXIT
 
-#ifndef HAVE_ON_EXIT
+#ifndef ON_EXIT
 
 # include <errno.h>
 
@@ -2987,7 +2987,7 @@ exit (int status)
   _exit (status);
 }
 
-#else /* HAVE_ON_EXIT */
+#else /* ON_EXIT */
 
 /* Simple; we just need a wrapper for ON_EXIT.  */
 int
@@ -2996,7 +2996,7 @@ atexit (func_ptr func)
   return ON_EXIT (func);
 }
 
-#endif /* HAVE_ON_EXIT */
+#endif /* ON_EXIT */
 #endif /* NEED_ATEXIT */
 
 #endif /* L_exit */