Merge pull request managarm#1651 from OBOS-dev/upstream-merge

OBOS mlibc sysdep

Author: avdgrinten

.github/workflows/ci.yml

@@ -133,7 +133,7 @@ jobs:
     compile-sysdeps:
         strategy:
             matrix:
-                sysdeps: [ironclad, keyronex, managarm, astral, menix, demo]
+                sysdeps: [ironclad, keyronex, managarm, astral, menix, demo, obos]
         name: Compile sysdeps
         runs-on: ubuntu-latest
         container: debian:trixie

ci/obos.cross-file

@@ -0,0 +1,12 @@
+[binaries]
+c = 'gcc'
+cpp = 'g++'
+
+[properties]
+needs_exe_wrapper = true
+
+[host_machine]
+system = 'obos'
+cpu_family = 'x86_64'
+cpu = 'x86_64'
+endian = 'little'

meson.build

@@ -272,6 +272,13 @@ elif host_machine.system() == 'astral'
 	internal_conf.set10('MLIBC_MAP_FILE_WINDOWS', true)
 	internal_conf.set10('MLIBC_MMAP_ALLOCATE_DSO', true)
 	subdir('sysdeps/astral')
+elif host_machine.system() == 'obos'
+    rtld_include_dirs += include_directories('sysdeps/obos/include')
+    libc_include_dirs += include_directories('sysdeps/obos/include')
+	internal_conf.set10('MLIBC_MAP_DSO_SEGMENTS', true)
+	internal_conf.set10('MLIBC_MAP_FILE_WINDOWS', true)
+	internal_conf.set10('MLIBC_MMAP_ALLOCATE_DSO', true)
+    subdir('sysdeps/obos')    
 elif host_machine.system() == 'menix'
 	rtld_include_dirs += include_directories('sysdeps/menix/include')
 	libc_include_dirs += include_directories('sysdeps/menix/include')

options/posix/include/mlibc/posix-sysdeps.hpp

@@ -143,7 +143,6 @@ int sys_close(int fd);
 [[gnu::weak]] int sys_mlock(const void *addr, size_t length);
 [[gnu::weak]] int sys_munlock(const void *addr, size_t length);
 [[gnu::weak]] int sys_mlockall(int flags);
-[[gnu::weak]] int sys_mlock(const void *addr, size_t len);
 [[gnu::weak]] int sys_munlockall(void);
 [[gnu::weak]] int sys_mincore(void *addr, size_t length, unsigned char *vec);
 

sysdeps/obos/generic/entry.cpp

@@ -0,0 +1,15 @@
+#include <bits/ensure.h>
+#include <mlibc/elf/startup.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+extern "C" void __dlapi_enter(uintptr_t *);
+
+extern char **environ;
+
+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::entry_stack.argc, mlibc::entry_stack.argv, environ);
+	exit(result);
+}