commit 24f2b526d5c4a5b093dab68540dc2665741cabf1
author Curtis Millar <curtis.millar@data61.csiro.au> Sat Sep 12 15:54:07 2020 +1000
committer Curtis Millar <curtis@curtism.me> Thu Sep 17 10:15:19 2020 +1000
tree d3210f39bbab595ed633536b295d00bf367d9678
parent 7853d576f016b25dbbb31af5e2b88d2cbd15ba7a

Use constructor to initialise libc

This initialises the C standard library using a constructor executed
from the sel4 runtime.

Signed-off-by: Curtis Millar <curtis.millar@data61.csiro.au>

libsel4muslcsys/CMakeLists.txt

diff --git a/libsel4muslcsys/CMakeLists.txt b/libsel4muslcsys/CMakeLists.txt
index 6464a36..bb8415d 100644
--- a/libsel4muslcsys/CMakeLists.txt
+++ b/libsel4muslcsys/CMakeLists.txt
@@ -73,6 +73,8 @@
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE=700 -DMUSLC_HIGHEST_SYSCALL=${HighestSyscall}")
 
 add_library(sel4muslcsys STATIC EXCLUDE_FROM_ALL ${deps})
+# Force the muslcsys_init_muslc constructor to be included in dependants
+target_link_options(sel4muslcsys BEFORE INTERFACE "-Wl,-umuslcsys_init_muslc")
 target_include_directories(sel4muslcsys PUBLIC include)
 target_link_libraries(
     sel4muslcsys

libsel4muslcsys/src/vsyscall.c

diff --git a/libsel4muslcsys/src/vsyscall.c b/libsel4muslcsys/src/vsyscall.c
index 021948b..e9f1b4e 100644
--- a/libsel4muslcsys/src/vsyscall.c
+++ b/libsel4muslcsys/src/vsyscall.c
@@ -14,7 +14,9 @@
 #include <sel4muslcsys/gen_config.h>
 #include <stdio.h>
 #include <stdint.h>
+#include <stddef.h>
 #include <sel4/sel4.h>
+#include <sel4runtime.h>
 #include <utils/util.h>
 #include <bits/syscall.h>
 #include <bits/errno.h>
@@ -219,7 +221,7 @@
  * it can be overriden. We are able to have this constructor
  * in this file since we know it will get looked at by the linker due
  * to __vsyscall_ptr being here */
-static void CONSTRUCTOR(CONSTRUCTOR_MIN_PRIORITY) init_syscall_table(void)
+static void CONSTRUCTOR(CONSTRUCTOR_MIN_PRIORITY + 1) init_syscall_table(void)
 {
     muslcsys_syscall_t ret UNUSED;
     ret = muslcsys_install_syscall(__NR_set_tid_address, sys_set_tid_address);
@@ -240,7 +242,7 @@
 #ifdef CONFIG_LIB_SEL4_MUSLC_SYS_CPIO_FS
 extern char _cpio_archive[];
 extern char _cpio_archive_end[];
-static void CONSTRUCTOR(CONSTRUCTOR_MIN_PRIORITY) install_default_cpio(void)
+static void CONSTRUCTOR(CONSTRUCTOR_MIN_PRIORITY + 1) install_default_cpio(void)
 {
     unsigned long cpio_len = _cpio_archive_end - _cpio_archive;
     muslcsys_install_cpio_interface(_cpio_archive, cpio_len, cpio_get_file);
@@ -292,3 +294,15 @@
 /* Put a pointer to sel4_vsyscall in a special section so anyone loading us
  * knows how to configure our syscall table */
 uintptr_t VISIBLE SECTION("__vsyscall") __vsyscall_ptr = (uintptr_t) sel4_vsyscall;
+
+/* muslc provides a function used to initialise the C standard library
+ * environment. */
+extern void __init_libc(char const *const *envp, char const *pn);
+
+/* Initialise muslc environment */
+void CONSTRUCTOR(CONSTRUCTOR_MIN_PRIORITY) muslcsys_init_muslc(void)
+{
+    seL4_IPCBuffer *tmp = __sel4_ipc_buffer;
+    __init_libc(sel4runtime_envp(), sel4runtime_argv()[0]);
+    __sel4_ipc_buffer = tmp;
+}