Merge pull request #1012 from stlankes/syscall

if the feature `syscall` is enabled, don't switch the stack
hermit-os · Dec 24, 2023 · e3b3e16 · e3b3e16
2 parents 5bcf624 + b2ae2c9
commit e3b3e16
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/macros.rs b/src/macros.rs
@@ -74,7 +74,8 @@ macro_rules! dbg {
 #[allow(unused_macro_rules)]
 #[cfg(not(any(
 	target_arch = "riscv64",
-	all(target_arch = "x86_64", feature = "newlib")
+	all(target_arch = "x86_64", feature = "newlib"),
+	feature = "syscall"
 )))]
 macro_rules! kernel_function {
 	($f:ident()) => {
@@ -111,7 +112,8 @@ macro_rules! kernel_function {
 // TODO: Switch kernel stack on RISC-V
 #[cfg(any(
 	target_arch = "riscv64",
-	all(target_arch = "x86_64", feature = "newlib")
+	all(target_arch = "x86_64", feature = "newlib"),
+	feature = "syscall"
 ))]
 macro_rules! kernel_function {
 	($f:ident($($x:tt)*)) => {{