From 98650d2fa2d2443ede83cc9f5d21d39e8078e60b Mon Sep 17 00:00:00 2001
From: Jeff Johnston <jjohnstn@redhat.com>
Date: Tue, 14 Sep 2004 18:12:53 +0000
Subject: 2004-09-14  Jeff Johnston  <jjohnstn@redhat.com>

        * configure.host: Add Cygwin sys directory.
        * configure.in: Do not set CRT0 for cygwin.
        * libc/configure.in: Ditto.
        * libc/sys/configure.in: Ditto.
        * configure: Regenerated.
        * libc/configure: Ditto.
        * libc/sys/configure: Ditto.
        * libc/include/sys/reent.h: Add __REENT_HAS_CXA_SUPPORT flag.
        * libc/stdlib/__atexit.c: Keep cxa support protected by new
        __REENT_HAS_CXA_SUPPORT flag.
        * libc/stdlib/__call_atexit.c: Ditto.
        * libc/stdlib/cxa_atexit.c: Ditto.
        * libc/stdlib/cxa_finalize.c: Ditto.
        * libc/sys/cygwin/Makefile.am: New file.
        * libc/sys/cygwin/Makefile.in: Ditto.
        * libc/sys/cygwin/aclocal.m4: Ditto.
        * libc/sys/cygwin/configure: Ditto.
        * libc/sys/cygwin/configure.in: Ditto.
        * libc/sys/cygwin/dummy.c: Ditto.
        * libc/sys/cygwin/sys/reent.h: Ditto.  This file is stabilized
        version of reent.h.
---
 newlib/libc/stdlib/__atexit.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'newlib/libc/stdlib/__atexit.c')

diff --git a/newlib/libc/stdlib/__atexit.c b/newlib/libc/stdlib/__atexit.c
index 0c843ade6..310b69174 100644
--- a/newlib/libc/stdlib/__atexit.c
+++ b/newlib/libc/stdlib/__atexit.c
@@ -8,6 +8,7 @@
 #include <sys/lock.h>
 #include "atexit.h"
 
+
 /*
  * Register a function to be performed at exit or on shared library unload.
  */
@@ -47,7 +48,9 @@ _DEFUN (__register_exitproc,
       _GLOBAL_REENT->_atexit = p;
 #ifndef _REENT_SMALL
       p->_on_exit_args._fntypes = 0;
+#ifdef __REENT_HAS_CXA_SUPPORT
       p->_on_exit_args._is_cxa = 0;
+#endif
 #endif
     }
 
@@ -67,16 +70,20 @@ _DEFUN (__register_exitproc,
 	    }
 	  args->_fntypes = 0;
 	  args->_is_cxa = 0;
+#ifdef __REENT_HAS_CXA_SUPPORT
 	  p->_on_exit_args_ptr = args;
+#endif
 	}
 #else
       args = &p->_on_exit_args;
 #endif
       args->_fnargs[p->_ind] = arg;
-      args->_dso_handle[p->_ind] = d;
       args->_fntypes |= (1 << p->_ind);
+#ifdef __REENT_HAS_CXA_SUPPORT
+      args->_dso_handle[p->_ind] = d;
       if (type == __et_cxa)
 	args->_is_cxa |= (1 << p->_ind);
+#endif
     }
   p->_fns[p->_ind++] = fn;
 #ifndef __SINGLE_THREAD__
-- 
cgit v1.2.3