Hide __atexit and __atexit_register_cleanup()

Wrap __cxa_{atexit,finalize}() so the call from exit() goes direct
Switch regress/lib/libc/atexit/ to be built with -static so that it can
  still access __atexit*

ok millert@ jca@

3 files changed, 12 insertions, 4 deletions

diff --git a/src/lib/libc/stdlib/atexit.c b/src/lib/libc/stdlib/atexit.c
index a33080571f..4ccf84562c 100644
--- a/src/lib/libc/stdlib/atexit.c
+++ b/src/lib/libc/stdlib/atexit.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atexit.c,v 1.21 2015/04/07 01:27:07 guenther Exp $ */
+/*      $OpenBSD: atexit.c,v 1.22 2015/10/25 18:01:24 guenther Exp $ */
 /*
  * Copyright (c) 2002 Daniel Hartmeier
  * All rights reserved.
@@ -103,6 +103,7 @@ unlock:
         _ATEXIT_UNLOCK();
         return (ret);
 }
+DEF_STRONG(__cxa_atexit);
 
 /*
  * Call all handlers registered with __cxa_atexit() for the shared
@@ -180,6 +181,7 @@ restart:
 
         }
 }
+DEF_STRONG(__cxa_finalize);
 
 /*
  * Register the cleanup function
diff --git a/src/lib/libc/stdlib/atexit.h b/src/lib/libc/stdlib/atexit.h
index 3de2aa3bf6..e2e821de04 100644
--- a/src/lib/libc/stdlib/atexit.h
+++ b/src/lib/libc/stdlib/atexit.h
@@ -1,4 +1,4 @@
-/*      $OpenBSD: atexit.h,v 1.9 2014/06/18 19:01:10 kettenis Exp $ */
+/*      $OpenBSD: atexit.h,v 1.10 2015/10/25 18:01:24 guenther Exp $ */
 
 /*
  * Copyright (c) 2002 Daniel Hartmeier
@@ -41,7 +41,12 @@ struct atexit {
         } fns[1];                       /* the table itself */
 };
 
+__BEGIN_HIDDEN_DECLS
 extern struct atexit *__atexit;         /* points to head of LIFO stack */
+__END_HIDDEN_DECLS
 
 int     __cxa_atexit(void (*)(void *), void *, void *);
 void    __cxa_finalize(void *);
+
+PROTO_NORMAL(__cxa_atexit);
+PROTO_NORMAL(__cxa_finalize);
diff --git a/src/regress/lib/libc/atexit/Makefile b/src/regress/lib/libc/atexit/Makefile
index c14b3c7ac4..057844d767 100644
--- a/src/regress/lib/libc/atexit/Makefile
+++ b/src/regress/lib/libc/atexit/Makefile
@@ -1,9 +1,10 @@
-#       $OpenBSD: Makefile,v 1.5 2003/07/31 22:46:59 david Exp $
+#       $OpenBSD: Makefile,v 1.6 2015/10/25 18:01:24 guenther Exp $
 
 NOMAN=
 PROG=atexit_test
-CPPFLAGS+=-I${.CURDIR}/../../../../lib/libc
+CPPFLAGS+=-I${.CURDIR}/../../../../lib/libc -D'PROTO_NORMAL(x)=__asm("")'
 CLEANFILES+= invalid.out valid.out
+LDADD=-static
 
 run-regress-atexit_test: ${PROG}
         ./${PROG} -valid 2>${.OBJDIR}/valid.out