Always call atexit handlers as if they were registered with __cxa_atexit.

The extra argument doesn't hurt genuine atexit handlers and this fixes a
bug where we didn't provide the argument (effectively passing garbage) for
functions registered with __cxa_atexit in the main executable.

Pointed out by Dmitriy Ivanov <dimitry@google.com> and Elliott Hughes
<enh@google.com>.

ok matthew@

1 files changed, 2 insertions, 5 deletions

diff --git a/src/lib/libc/stdlib/atexit.h b/src/lib/libc/stdlib/atexit.h
index c44005deda..3de2aa3bf6 100644
--- a/src/lib/libc/stdlib/atexit.h
+++ b/src/lib/libc/stdlib/atexit.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atexit.h,v 1.8 2013/06/02 21:08:36 matthew Exp $ */
+/*      $OpenBSD: atexit.h,v 1.9 2014/06/18 19:01:10 kettenis Exp $ */
 
 /*
  * Copyright (c) 2002 Daniel Hartmeier
@@ -35,10 +35,7 @@ struct atexit {
         int ind;                        /* next index in this table */
         int max;                        /* max entries >= ATEXIT_SIZE */
         struct atexit_fn {
-                union {
-                        void (*std_func)(void);
-                        void (*cxa_func)(void *);
-                } fn_ptr;
+                void (*fn_ptr)(void *);
                 void *fn_arg;           /* argument for CXA callback */
                 void *fn_dso;           /* shared module handle */
         } fns[1];                       /* the table itself */