[src/netbsd-7]: src Pull up following revision(s) (requested by joerg in tick...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/cac185e4dd23
branches:  netbsd-7
changeset: 799237:cac185e4dd23
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Apr 21 04:50:17 2015 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #712):
        lib/libc/stdlib/atexit.c: revision 1.29
        external/gpl3/gcc/dist/libstdc++-v3/libsupc++/atexit_arm.cc: revision 1.2
Redo __aeabi_atexit by shuffling the arguments and dropping the code in
libstdc++.

diffstat:

 external/gpl3/gcc/dist/libstdc++-v3/libsupc++/atexit_arm.cc |   2 +-
 lib/libc/stdlib/atexit.c                                    |  13 ++++++++++---
 2 files changed, 11 insertions(+), 4 deletions(-)

diffs (46 lines):

diff -r 81ef508ee780 -r cac185e4dd23 external/gpl3/gcc/dist/libstdc++-v3/libsupc++/atexit_arm.cc
--- a/external/gpl3/gcc/dist/libstdc++-v3/libsupc++/atexit_arm.cc       Sun Apr 19 16:49:08 2015 +0000
+++ b/external/gpl3/gcc/dist/libstdc++-v3/libsupc++/atexit_arm.cc       Tue Apr 21 04:50:17 2015 +0000
@@ -23,7 +23,7 @@
 
 #include <cxxabi.h>
 
-#if defined(__arm__) && defined(__ARM_EABI__)
+#if defined(__arm__) && defined(__ARM_EABI__) && !defined(__NetBSD__)
 
 namespace __aeabiv1
 {
diff -r 81ef508ee780 -r cac185e4dd23 lib/libc/stdlib/atexit.c
--- a/lib/libc/stdlib/atexit.c  Sun Apr 19 16:49:08 2015 +0000
+++ b/lib/libc/stdlib/atexit.c  Tue Apr 21 04:50:17 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atexit.c,v 1.26.4.1 2015/04/19 05:03:02 msaitoh Exp $  */
+/*     $NetBSD: atexit.c,v 1.26.4.2 2015/04/21 04:50:17 snj Exp $      */
 
 /*-
  * Copyright (c) 2003 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
 
 #include <sys/cdefs.h>
 #if defined(LIBC_SCCS) && !defined(lint)
-__RCSID("$NetBSD: atexit.c,v 1.26.4.1 2015/04/19 05:03:02 msaitoh Exp $");
+__RCSID("$NetBSD: atexit.c,v 1.26.4.2 2015/04/21 04:50:17 snj Exp $");
 #endif /* LIBC_SCCS and not lint */
 
 #include "reentrant.h"
@@ -134,7 +134,14 @@
  *     http://www.codesourcery.com/cxx-abi/abi.html#dso-dtor
  */
 #if defined(__ARM_EABI__) && !defined(lint)
-__strong_alias(__aeabi_atexit,__cxa_atexit);
+int
+__aeabi_atexit(void *arg, void (*func)(void *), void *dso);
+
+int
+__aeabi_atexit(void *arg, void (*func)(void *), void *dso)
+{
+       return __cxa_atexit(func, arg, dso);
+}
 #endif
 
 int