Merge pull request #1210 from 64/entry

sysdeps: simplify entry point

options/ansi/generic/locale.cpp

@@ -71,7 +71,8 @@ namespace mlibc {
 	const locale_description *messages_facet;
 }
 
-void __mlibc_initLocale() {
+[[gnu::constructor]]
+static void init_locale() {
 	mlibc::collate_facet = &mlibc::c_locale;
 	mlibc::ctype_facet = &mlibc::c_locale;
 	mlibc::monetary_facet = &mlibc::c_locale;

options/elf/generic/startup.cpp

@@ -12,31 +12,18 @@ extern "C" size_t __init_array_end[];
 extern "C" size_t __preinit_array_start[];
 extern "C" size_t __preinit_array_end[];
 
-static int constructors_ran_already = 0;
+extern "C" uintptr_t *__dlapi_entrystack();
 
-struct global_constructor_guard {
-    global_constructor_guard() {
-        constructors_ran_already = 1;
-    }
-};
+namespace mlibc {
 
-static global_constructor_guard g;
+exec_stack_data entry_stack;
 
-void __mlibc_run_constructors() {
-/*
-    if (!constructors_ran_already) {
-        size_t constructor_count = (size_t)__init_array_end - (size_t)__init_array_start;
-        constructor_count /= sizeof(void*);
-        for (size_t i = 0; i < constructor_count; i++) {
-            void (*ptr)(void) = (void(*)(void))(__init_array_start[i]);
-            ptr();
-        }
-    }
-*/
+[[gnu::constructor]]
+void init_libc() {
+	mlibc::parse_exec_stack(__dlapi_entrystack(), &entry_stack);
+	mlibc::set_startup_data(entry_stack.argc, entry_stack.argv, entry_stack.envp);
 }
 
-namespace mlibc {
-
 void parse_exec_stack(void *opaque_sp, exec_stack_data *data) {
 	auto sp = reinterpret_cast<uintptr_t *>(opaque_sp);
 	data->argc = *sp++;

options/elf/include/mlibc/elf/startup.h

@@ -1,12 +1,6 @@
 #ifndef MLIBC_ELF_STARTUP
 #define MLIBC_ELF_STARTUP
 
-#ifndef __MLIBC_ABI_ONLY
-
-void __mlibc_run_constructors();
-
-#endif /* !__MLIBC_ABI_ONLY */
-
 namespace mlibc {
 
 struct exec_stack_data {
@@ -15,6 +9,8 @@ struct exec_stack_data {
 	char **envp;
 };
 
+extern exec_stack_data entry_stack;
+
 #ifndef __MLIBC_ABI_ONLY
 
 void parse_exec_stack(void *sp, exec_stack_data *data);

sysdeps/aero/generic/entry.cpp

@@ -3,34 +3,15 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-// defined by the POSIX library
-void __mlibc_initLocale();
-
 extern "C" uintptr_t *__dlapi_entrystack();
 
 extern char **environ;
-static mlibc::exec_stack_data __mlibc_stack_data;
-
-struct LibraryGuard {
-    LibraryGuard();
-};
-
-static LibraryGuard guard;
-
-LibraryGuard::LibraryGuard() {
-    __mlibc_initLocale();
-
-    // Parse the exec() stack.
-    mlibc::parse_exec_stack(__dlapi_entrystack(), &__mlibc_stack_data);
-    mlibc::set_startup_data(__mlibc_stack_data.argc, __mlibc_stack_data.argv,
-                            __mlibc_stack_data.envp);
-}
 
 extern "C" void __mlibc_entry(int (*main_fn)(int argc, char *argv[],
                                              char *env[])) {
     // TODO: call __dlapi_enter, otherwise static builds will break (see Linux
     // sysdeps)
     auto result =
-        main_fn(__mlibc_stack_data.argc, __mlibc_stack_data.argv, environ);
+        main_fn(mlibc::entry_stack.argc, mlibc::entry_stack.argv, environ);
     exit(result);
 }

sysdeps/astral/generic/entry.cpp

@@ -3,33 +3,13 @@
 #include <bits/ensure.h>
 #include <mlibc/elf/startup.h>
 
-// defined by the POSIX library
-void __mlibc_initLocale();
-
-extern "C" uintptr_t *__dlapi_entrystack();
 extern "C" void __dlapi_enter(uintptr_t *);
 
 extern char **environ;
-static mlibc::exec_stack_data __mlibc_stack_data;
-
-struct LibraryGuard {
-	LibraryGuard();
-};
-
-static LibraryGuard guard;
-
-LibraryGuard::LibraryGuard() {
-	__mlibc_initLocale();
-
-	// Parse the exec() stack.
-	mlibc::parse_exec_stack(__dlapi_entrystack(), &__mlibc_stack_data);
-	mlibc::set_startup_data(__mlibc_stack_data.argc, __mlibc_stack_data.argv,
-			__mlibc_stack_data.envp);
-}
 
 extern "C" void __mlibc_entry(int (*main_fn)(int argc, char *argv[], char *env[]), uintptr_t *entry_stack) {
 	__dlapi_enter(entry_stack);
-	auto result = main_fn(__mlibc_stack_data.argc, __mlibc_stack_data.argv, environ);
+	auto result = main_fn(mlibc::entry_stack.argc, mlibc::entry_stack.argv, environ);
 	exit(result);
 }
 

sysdeps/dripos/generic/entry.cpp

@@ -4,32 +4,11 @@
 #include <bits/ensure.h>
 #include <mlibc/elf/startup.h>
 
-// defined by the POSIX library
-void __mlibc_initLocale();
-
-extern "C" uintptr_t *__dlapi_entrystack();
-
 extern char **environ;
-static mlibc::exec_stack_data __mlibc_stack_data;
-
-struct LibraryGuard {
-	LibraryGuard();
-};
-
-static LibraryGuard guard;
-
-LibraryGuard::LibraryGuard() {
-	__mlibc_initLocale();
-
-	// Parse the exec() stack.
-	mlibc::parse_exec_stack(__dlapi_entrystack(), &__mlibc_stack_data);
-	mlibc::set_startup_data(__mlibc_stack_data.argc, __mlibc_stack_data.argv,
-			__mlibc_stack_data.envp);
-}
 
 extern "C" void __mlibc_entry(int (*main_fn)(int argc, char *argv[], char *env[])) {
 	// TODO: call __dlapi_enter, otherwise static builds will break (see Linux sysdeps)
-	auto result = main_fn(__mlibc_stack_data.argc, __mlibc_stack_data.argv, environ);
+	auto result = main_fn(mlibc::entry_stack.argc, mlibc::entry_stack.argv, environ);
 	exit(result);
 }
 

sysdeps/ironclad/generic/entry.cpp

@@ -4,34 +4,14 @@
 #include <bits/ensure.h>
 #include <mlibc/elf/startup.h>
 
-// defined by the POSIX library
-void __mlibc_initLocale();
-
-extern "C" uintptr_t *__dlapi_entrystack();
 extern "C" void __dlapi_enter(uintptr_t *);
 
 extern char **environ;
-static mlibc::exec_stack_data __mlibc_stack_data;
-
-struct LibraryGuard {
-	LibraryGuard();
-};
-
-static LibraryGuard guard;
-
-LibraryGuard::LibraryGuard() {
-	__mlibc_initLocale();
-
-	// Parse the exec() stack.
-	mlibc::parse_exec_stack(__dlapi_entrystack(), &__mlibc_stack_data);
-	mlibc::set_startup_data(__mlibc_stack_data.argc, __mlibc_stack_data.argv,
-			__mlibc_stack_data.envp);
-}
 
 extern "C" void __mlibc_entry(uintptr_t *entry_stack, int (*main_fn)(int argc, char *argv[], char *env[])) {
 	__dlapi_enter(entry_stack);
 
-	auto result = main_fn(__mlibc_stack_data.argc, __mlibc_stack_data.argv, environ);
+	auto result = main_fn(mlibc::entry_stack.argc, mlibc::entry_stack.argv, environ);
 	exit(result);
 }
 

sysdeps/keyronex/generic/entry.cpp

@@ -7,29 +7,7 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-// defined by the POSIX library
-void __mlibc_initLocale();
-
-extern "C" uintptr_t *__dlapi_entrystack();
-
 extern char **environ;
-static mlibc::exec_stack_data __mlibc_stack_data;
-
-struct LibraryGuard {
-	LibraryGuard();
-};
-
-static LibraryGuard guard;
-
-LibraryGuard::LibraryGuard()
-{
-	__mlibc_initLocale();
-
-	// Parse the exec() stack.
-	mlibc::parse_exec_stack(__dlapi_entrystack(), &__mlibc_stack_data);
-	mlibc::set_startup_data(__mlibc_stack_data.argc,
-	    __mlibc_stack_data.argv, __mlibc_stack_data.envp);
-}
 
 namespace mlibc {
 int
@@ -102,7 +80,7 @@ __mlibc_entry(int (*main_fn)(int argc, char *argv[], char *env[]))
 
 	// TODO: call __dlapi_enter, otherwise static builds will break (see
 	// Linux sysdeps)
-	auto result = main_fn(__mlibc_stack_data.argc, __mlibc_stack_data.argv,
+	auto result = main_fn(mlibc::entry_stack.argc, mlibc::entry_stack.argv,
 	    environ);
 	exit(result);
 }

sysdeps/lemon/generic/entry.cpp

@@ -3,31 +3,10 @@
 #include <bits/ensure.h>
 #include <mlibc/elf/startup.h>
 
-// defined by the POSIX library
-void __mlibc_initLocale();
-
-extern "C" uintptr_t *__dlapi_entrystack();
-
 extern char **environ;
-static mlibc::exec_stack_data __mlibc_stack_data;
-
-struct LibraryGuard {
-	LibraryGuard();
-};
-
-static LibraryGuard guard;
-
-LibraryGuard::LibraryGuard() {
-	__mlibc_initLocale();
-
-	// Parse the exec() stack.
-	mlibc::parse_exec_stack(__dlapi_entrystack(), &__mlibc_stack_data);
-	mlibc::set_startup_data(__mlibc_stack_data.argc, __mlibc_stack_data.argv,
-			__mlibc_stack_data.envp);
-}
 
 extern "C" void __mlibc_entry(int (*main_fn)(int argc, char *argv[], char *env[])) {
 	// TODO: call __dlapi_enter, otherwise static builds will break (see Linux sysdeps)
-	auto result = main_fn(__mlibc_stack_data.argc, __mlibc_stack_data.argv, environ);
+	auto result = main_fn(mlibc::entry_stack.argc, mlibc::entry_stack.argv, environ);
 	exit(result);
 }

sysdeps/linux/generic/entry.cpp

@@ -4,35 +4,15 @@
 #include <mlibc/elf/startup.h>
 #include <sys/auxv.h>
 
-// defined by the POSIX library
-void __mlibc_initLocale();
-
-extern "C" uintptr_t *__dlapi_entrystack();
 extern "C" void __dlapi_enter(uintptr_t *);
 
 extern char **environ;
-static mlibc::exec_stack_data __mlibc_stack_data;
 
 size_t __hwcap;
 
-struct LibraryGuard {
-	LibraryGuard();
-};
-
-static LibraryGuard guard;
-
-LibraryGuard::LibraryGuard() {
-	__mlibc_initLocale();
-
-	// Parse the exec() stack.
-	mlibc::parse_exec_stack(__dlapi_entrystack(), &__mlibc_stack_data);
-	mlibc::set_startup_data(__mlibc_stack_data.argc, __mlibc_stack_data.argv,
-			__mlibc_stack_data.envp);
-}
-
 extern "C" void __mlibc_entry(uintptr_t *entry_stack, int (*main_fn)(int argc, char *argv[], char *env[])) {
 	__dlapi_enter(entry_stack);
 	__hwcap = getauxval(AT_HWCAP);
-	auto result = main_fn(__mlibc_stack_data.argc, __mlibc_stack_data.argv, environ);
+	auto result = main_fn(mlibc::entry_stack.argc, mlibc::entry_stack.argv, environ);
 	exit(result);
 }

sysdeps/lyre/generic/entry.cpp

@@ -7,29 +7,9 @@
 #include <bits/posix/posix_signal.h>
 #include <lyre/syscall.h>
 
-// defined by the POSIX library
-void __mlibc_initLocale();
-
-extern "C" uintptr_t *__dlapi_entrystack();
 extern "C" void __dlapi_enter(uintptr_t *);
 
 extern char **environ;
-static mlibc::exec_stack_data __mlibc_stack_data;
-
-struct LibraryGuard {
-	LibraryGuard();
-};
-
-static LibraryGuard guard;
-
-LibraryGuard::LibraryGuard() {
-	__mlibc_initLocale();
-
-	// Parse the exec() stack.
-	mlibc::parse_exec_stack(__dlapi_entrystack(), &__mlibc_stack_data);
-	mlibc::set_startup_data(__mlibc_stack_data.argc, __mlibc_stack_data.argv,
-			__mlibc_stack_data.envp);
-}
 
 struct GPRState {
 	uint64_t ds;
@@ -116,7 +96,7 @@ extern "C" void __mlibc_entry(uintptr_t *entry_stack, int (*main_fn)(int argc, c
 
 	//mlibc::sys_sigentry((void *)__mlibc_sigentry);
 
-	auto result = main_fn(__mlibc_stack_data.argc, __mlibc_stack_data.argv, environ);
+	auto result = main_fn(mlibc::entry_stack.argc, mlibc::entry_stack.argv, environ);
 	exit(result);
 }
 

sysdeps/managarm/generic/entry.cpp

@@ -14,9 +14,6 @@
 #include <protocols/posix/data.hpp>
 #include <protocols/posix/supercalls.hpp>
 
-// defined by the POSIX library
-void __mlibc_initLocale();
-
 extern "C" uintptr_t *__dlapi_entrystack();
 extern "C" void __dlapi_enter(uintptr_t *);
 
@@ -107,28 +104,11 @@ HelHandle getHandleForFd(int fd) {
 
 void clearCachedInfos() { has_cached_infos = PTHREAD_ONCE_INIT; }
 
-struct LibraryGuard {
-	LibraryGuard();
-};
-
-static LibraryGuard guard;
-
 extern char **environ;
-static mlibc::exec_stack_data __mlibc_stack_data;
-
-LibraryGuard::LibraryGuard() {
-	__mlibc_initLocale();
-
-	// Parse the exec() stack.
-	mlibc::parse_exec_stack(__dlapi_entrystack(), &__mlibc_stack_data);
-	mlibc::set_startup_data(
-	    __mlibc_stack_data.argc, __mlibc_stack_data.argv, __mlibc_stack_data.envp
-	);
-}
 
 extern "C" void
 __mlibc_entry(uintptr_t *entry_stack, int (*main_fn)(int argc, char *argv[], char *env[])) {
 	__dlapi_enter(entry_stack);
-	auto result = main_fn(__mlibc_stack_data.argc, __mlibc_stack_data.argv, environ);
+	auto result = main_fn(mlibc::entry_stack.argc, mlibc::entry_stack.argv, environ);
 	exit(result);
 }