From 5085e91a323072e923f46bad4199e6abd9d12ae7 Mon Sep 17 00:00:00 2001
From: midipix <writeonce@midipix.org>
Date: Sat, 25 Apr 2015 10:14:19 -0400
Subject: complete/fix support of ctors/dtors and tls.

+ do not build libc.so with -DSHARED for the midipix targets.
+ provide surrogate init/fini arrays that allow invocation of the
  ctors/dtors iteration routines.
+ provide a builtin tls for the first thread.
+ update __copy_tls to match the layout of the simplified struct __tls.

signed-off by Z. Gilboa; see copying.midipix (9cd0746c) for additional information.
---
 arch/nt32/psxglue.h      |  2 ++
 arch/nt32/src/crt_glue.c | 30 +++++++++++++++++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'arch/nt32')

diff --git a/arch/nt32/psxglue.h b/arch/nt32/psxglue.h
index 73ad2b0..4910be4 100644
--- a/arch/nt32/psxglue.h
+++ b/arch/nt32/psxglue.h
@@ -44,6 +44,8 @@ struct __psx_context {
 	unsigned int		teb_libc_idx;
 	void *			pthread_surrogate_fn;
 	void *			pthread_create_fn;
+	void *			do_global_ctors_fn;
+	void *			do_global_dtors_fn;
 };
 
 struct __tlca {
diff --git a/arch/nt32/src/crt_glue.c b/arch/nt32/src/crt_glue.c
index abfd1fe..2559348 100644
--- a/arch/nt32/src/crt_glue.c
+++ b/arch/nt32/src/crt_glue.c
@@ -8,6 +8,9 @@
 extern struct __ldso_vtbl *	__ldso_vtbl;
 extern struct __psx_vtbl *	__psx_vtbl;
 
+extern void * __init_array_start;
+extern void * __fini_array_start;
+
 typedef int __app_main();
 typedef int __pthread_surrogate_routine(struct pthread *);
 
@@ -19,6 +22,26 @@ extern int __libc_start_main(
 	int	argc,
 	char **	argv);
 
+static struct __tls {
+	void *		pad[16/sizeof(void *)];
+	struct pthread	pt;
+} __builtin_tls = {{0}};
+
+void __init_tls (size_t * auxv)
+{
+	#define T __builtin_tls
+
+	__set_thread_area(&T.pt);
+
+	T.pt.self	= &T.pt;
+	T.pt.locale	= &libc.global_locale;
+	T.pt.tid	= __syscall(SYS_set_tid_address, &T.pt.tid);
+
+	libc.can_do_threads	= 1;
+        libc.has_thread_pointer	= 1;
+	libc.tls_size = sizeof(struct __tls);
+};
+
 void __libc_entry_routine(
 	__app_main *		__main,
 	__psx_init_routine *	__psx_init,
@@ -43,9 +66,6 @@ void __libc_entry_routine(
 	else if (envp != argv + (argc + 1))
 		a_crash();
 
-	/* dso init routines */
-	_init();
-
 	/* write once */
 	__syscall_vtbl	= (unsigned long **)ctx.sys_vtbl;
 	__ldso_vtbl	= ctx.ldso_vtbl;
@@ -53,6 +73,10 @@ void __libc_entry_routine(
 	__teb_sys_idx	= ctx.teb_sys_idx;
 	__teb_libc_idx	= ctx.teb_libc_idx;
 
+	/* surrogate init/fini arrays */
+	__init_array_start = ctx.do_global_ctors_fn;
+	__fini_array_start = ctx.do_global_dtors_fn;
+
 	/* enter libc */
 	__libc_start_main(__main,argc,argv);
 
-- 
cgit v1.2.3