Merge pull request #1049 from mintsuki/sysdeps-dlapi-enter

sysdeps: Lyre/Ironclad: call __dlapi_enter() on entry
managarm · Apr 2, 2024 · 0c28bd8 · 0c28bd8
2 parents 8a02b79 + e1de211
commit 0c28bd8
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/sysdeps/ironclad/crt-x86_64/crt0.S b/sysdeps/ironclad/crt-x86_64/crt0.S
@@ -1,9 +1,8 @@
-
 .section .text
 .global _start
 _start:
-    mov $main, %rdi
+    mov %rsp, %rdi
+    lea main(%rip), %rsi
     call __mlibc_entry
-
 .section .note.GNU-stack,"",%progbits
 
diff --git a/sysdeps/ironclad/generic/entry.cpp b/sysdeps/ironclad/generic/entry.cpp
@@ -8,6 +8,7 @@
 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;
@@ -27,8 +28,9 @@ LibraryGuard::LibraryGuard() {
 			__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)
+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);
 	exit(result);
 }

diff --git a/sysdeps/lyre/generic/entry.cpp b/sysdeps/lyre/generic/entry.cpp
@@ -11,6 +11,7 @@
 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;
@@ -110,10 +111,11 @@ static void __mlibc_sigentry(int which, siginfo_t *siginfo,
 	__builtin_unreachable();
 }
 
-extern "C" void __mlibc_entry(int (*main_fn)(int argc, char *argv[], char *env[])) {
+extern "C" void __mlibc_entry(uintptr_t *entry_stack, int (*main_fn)(int argc, char *argv[], char *env[])) {
+	__dlapi_enter(entry_stack);
+
 	//mlibc::sys_sigentry((void *)__mlibc_sigentry);
 
-	// 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);
 	exit(result);
 }

diff --git a/sysdeps/lyre/x86_64/crt-src/crt0.S b/sysdeps/lyre/x86_64/crt-src/crt0.S
@@ -1,7 +1,8 @@
 .section .text
 .global _start
 _start:
-    mov $main, %rdi
+    mov %rsp, %rdi
+    lea main(%rip), %rsi
     call __mlibc_entry
 .section .note.GNU-stack,"",%progbits