Merge pull request #1191 from avdgrinten/managarm-riscv

sysdeps/managarm: Fix crti.S + crtn.S and sys_tcb_set()
managarm · Nov 28, 2024 · 8487c65 · 8487c65
2 parents b115980 + 53c05fa
commit 8487c65
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 54 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ jobs:
                     builds: mlibc
                     compiler: clang
         name: Build mlibc
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         container:
           image: ghcr.io/managarm/mlibc-crossers:latest
         steps:

diff --git a/.github/workflows/rust-libc.yml b/.github/workflows/rust-libc.yml
@@ -5,7 +5,7 @@ on: [pull_request, merge_group]
 jobs:
     check-bindings:
         name: Verify bindings generation
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-22.04
         container:
           image: ghcr.io/managarm/mlibc-crossers:latest
         steps:

diff --git a/sysdeps/linux/meson.build b/sysdeps/linux/meson.build
@@ -112,23 +112,26 @@ if not headers_only
 		install_dir: get_option('libdir')
 	)
 
-	custom_target('crti',
-		build_by_default: true,
-		command: c_compiler.cmd_array() + ['-c', '-o', '@OUTPUT@', '@INPUT@'],
-		input: host_machine.cpu_family() / 'crt-src/crti.S',
-		output: 'crti.o',
-		install: true,
-		install_dir: get_option('libdir')
-	)
+	# On RISC-V, crti.o and crtn.o are provided by GCC.
+	if host_machine.cpu_family() != 'riscv64'
+		custom_target('crti',
+			build_by_default: true,
+			command: c_compiler.cmd_array() + ['-c', '-o', '@OUTPUT@', '@INPUT@'],
+			input: host_machine.cpu_family() / 'crt-src/crti.S',
+			output: 'crti.o',
+			install: true,
+			install_dir: get_option('libdir')
+		)
 
-	custom_target('crtn',
-		build_by_default: true,
-		command: c_compiler.cmd_array() + ['-c', '-o', '@OUTPUT@', '@INPUT@'],
-		input: host_machine.cpu_family() / 'crt-src/crtn.S',
-		output: 'crtn.o',
-		install: true,
-		install_dir: get_option('libdir')
-	)
+		custom_target('crtn',
+			build_by_default: true,
+			command: c_compiler.cmd_array() + ['-c', '-o', '@OUTPUT@', '@INPUT@'],
+			input: host_machine.cpu_family() / 'crt-src/crtn.S',
+			output: 'crtn.o',
+			install: true,
+			install_dir: get_option('libdir')
+		)
+	endif
 
 	wrapper_conf = configuration_data()
 	wrapper_conf.set('LIBDIR', get_option('libdir'))

diff --git a/sysdeps/linux/riscv64/crt-src/crti.S b/sysdeps/linux/riscv64/crt-src/crti.S
diff --git a/sysdeps/linux/riscv64/crt-src/crtn.S b/sysdeps/linux/riscv64/crt-src/crtn.S
diff --git a/sysdeps/managarm/riscv64/crt-src/crti.S b/sysdeps/managarm/riscv64/crt-src/crti.S
@@ -1,11 +1 @@
-.section .init
-.global _init
-_init:
-	unimp
-
-.section .fini
-.global _fini
-_fini:
-	unimp
-.section .note.GNU-stack,"",%progbits
 
diff --git a/sysdeps/managarm/riscv64/crt-src/crtn.S b/sysdeps/managarm/riscv64/crt-src/crtn.S
@@ -1,7 +1 @@
-.section .init
-	unimp
-
-.section .fini
-	unimp
-.section .note.GNU-stack,"",%progbits
 
diff --git a/sysdeps/managarm/rtld-generic/support.cpp b/sysdeps/managarm/rtld-generic/support.cpp
@@ -176,12 +176,17 @@ HelHandleResult *parseHandle(void *&element) {
 namespace mlibc {
 
 int sys_tcb_set(void *pointer) {
-#if defined(__aarch64__)
+#if defined(__x86_64__)
+	HEL_CHECK(helWriteFsBase(pointer));
+#elif defined(__aarch64__)
 	uintptr_t addr = reinterpret_cast<uintptr_t>(pointer);
 	addr += sizeof(Tcb) - 0x10;
 	asm volatile ("msr tpidr_el0, %0" :: "r"(addr));
+#elif defined(__riscv) && __riscv_xlen == 64
+	uintptr_t tp = reinterpret_cast<uintptr_t>(pointer) + sizeof(Tcb);
+	asm volatile ("mv tp, %0" : : "r"(tp) : "memory");
 #else
-	HEL_CHECK(helWriteFsBase(pointer));
+#error Unknown architecture
 #endif
 	return 0;
 }