2004-09-15 Jeff Johnston <jjohnstn@redhat.com>

[pf3gnuchains/pf3gnuchains4x.git] / newlib / libc / stdlib / __call_atexit.c

diff --git a/newlib/libc/stdlib/__call_atexit.c b/newlib/libc/stdlib/__call_atexit.c
index 8e91770..cea569f 100644 (file)
--- a/newlib/libc/stdlib/__call_atexit.c
+++ b/newlib/libc/stdlib/__call_atexit.c
@@ -36,11 +36,9 @@ _DEFUN (__call_exitprocs, (code, d),
        {
          i = 1 << n;
 
-#ifdef __REENT_HAS_CXA_SUPPORT
          /* Skip functions not from this dso.  */
          if (d && (!args || args->_dso_handle[n] != d))
            continue;
-#endif
 
          /* Remove the function now to protect against the
             function calling exit recursively.  */
@@ -57,10 +55,8 @@ _DEFUN (__call_exitprocs, (code, d),
          /* Call the function.  */
          if (!args || (args->_fntypes & i) == 0)
            fn ();
-#ifdef __REENT_HAS_CXA_SUPPORT
          else if ((args->_is_cxa & i) == 0)
            (*((void (*)(int, _PTR)) fn))(code, args->_fnargs[n]);
-#endif
          else
            (*((void (*)(_PTR)) fn))(args->_fnargs[n]);
        }