[src/matt-nb6-plus]: src/lib/csu/common Pullup from HEAD:

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

details:   https://anonhg.NetBSD.org/src/rev/0ee1ae8ebe9f
branches:  matt-nb6-plus
changeset: 774539:0ee1ae8ebe9f
user:      matt <matt%NetBSD.org@localhost>
date:      Tue Jan 22 22:56:58 2013 +0000

description:
Pullup from HEAD:
Add support for init_array/fini_array (conditionalized on HAVE_INITFINI_ARRAY).
[This is needed for ARM EABI.]

diffstat:

 lib/csu/common/crt0-common.c |  36 ++++++++++++++++++++++++++++++++++--
 1 files changed, 34 insertions(+), 2 deletions(-)

diffs (66 lines):

diff -r 17fd7ab82f08 -r 0ee1ae8ebe9f lib/csu/common/crt0-common.c
--- a/lib/csu/common/crt0-common.c      Tue Jan 22 22:56:35 2013 +0000
+++ b/lib/csu/common/crt0-common.c      Tue Jan 22 22:56:58 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: crt0-common.c,v 1.7 2011/06/30 20:07:35 matt Exp $ */
+/* $NetBSD: crt0-common.c,v 1.7.6.1 2013/01/22 22:56:58 matt Exp $ */
 
 /*
  * Copyright (c) 1998 Christos Zoulas
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: crt0-common.c,v 1.7 2011/06/30 20:07:35 matt Exp $");
+__RCSID("$NetBSD: crt0-common.c,v 1.7.6.1 2013/01/22 22:56:58 matt Exp $");
 
 #include <sys/types.h>
 #include <sys/exec.h>
@@ -49,8 +49,10 @@
 
 extern int main(int, char **, char **);
 
+#ifndef HAVE_INITFINI_ARRAY
 extern void    _init(void);
 extern void    _fini(void);
+#endif
 extern void    _libc_init(void);
 
 /*
@@ -85,6 +87,36 @@
        _exit(1);                               \
 } while (0)
 
+#ifdef HAVE_INITFINI_ARRAY
+/*
+ * If we are using INIT_ARRAY/FINI_ARRAY and we are linked statically,
+ * we have to process these instead of relying on RTLD to do it for us.
+ *
+ * Since we don't need .init or .fini sections, just code them in C
+ * to make life easier.
+ */
+extern const fptr_t init_array_start[] __weak_reference(__init_array_start);
+extern const fptr_t init_array_end[] __weak_reference(__init_array_end);
+extern const fptr_t fini_array_start[] __weak_reference(__fini_array_start);
+extern const fptr_t fini_array_end[] __weak_reference(__fini_array_end);
+
+static inline void
+_init(void)
+{
+       for (const fptr_t *f = init_array_start; f < init_array_end; f++) {
+               (*f)();
+       }
+}
+
+static void
+_fini(void)
+{
+       for (const fptr_t *f = fini_array_start; f < fini_array_end; f++) {
+               (*f)();
+       }
+}
+#endif /* HAVE_INITFINI_ARRAY */
+
 void
 ___start(void (*cleanup)(void),                        /* from shared loader */
     const Obj_Entry *obj,                      /* from shared loader */