diff --git a/src/system/glue/arch/riscv32/crti.S b/src/system/glue/arch/riscv32/crti.S
index 337c772ec2..3f51db9ced 100644
--- a/src/system/glue/arch/riscv32/crti.S
+++ b/src/system/glue/arch/riscv32/crti.S
@@ -21,10 +21,10 @@
 
 .section .init
 FUNCTION(_init):
-	bl	__haiku_init_before
+	jal	__haiku_init_before
 	// crtbegin.o stuff comes here
 
 .section .fini
 FUNCTION(_fini):
-	bl	__haiku_term_before
+	jal	__haiku_term_before
 	// crtbegin.o stuff comes here
diff --git a/src/system/glue/arch/riscv32/crtn.S b/src/system/glue/arch/riscv32/crtn.S
index 125022e37d..ff63444a4d 100644
--- a/src/system/glue/arch/riscv32/crtn.S
+++ b/src/system/glue/arch/riscv32/crtn.S
@@ -10,10 +10,10 @@
 
 .section .init
 	// the image ID and program args are still on the stack
-	bl	__haiku_init_after
+	jal	__haiku_init_after
 
 
 .section .fini
 	// the image ID and program args are still on the stack
-	bl	__haiku_term_after
+	jal	__haiku_term_after
 
diff --git a/src/system/glue/arch/riscv64/crti.S b/src/system/glue/arch/riscv64/crti.S
index 337c772ec2..3f51db9ced 100644
--- a/src/system/glue/arch/riscv64/crti.S
+++ b/src/system/glue/arch/riscv64/crti.S
@@ -21,10 +21,10 @@
 
 .section .init
 FUNCTION(_init):
-	bl	__haiku_init_before
+	jal	__haiku_init_before
 	// crtbegin.o stuff comes here
 
 .section .fini
 FUNCTION(_fini):
-	bl	__haiku_term_before
+	jal	__haiku_term_before
 	// crtbegin.o stuff comes here
diff --git a/src/system/glue/arch/riscv64/crtn.S b/src/system/glue/arch/riscv64/crtn.S
index 125022e37d..ff63444a4d 100644
--- a/src/system/glue/arch/riscv64/crtn.S
+++ b/src/system/glue/arch/riscv64/crtn.S
@@ -10,10 +10,10 @@
 
 .section .init
 	// the image ID and program args are still on the stack
-	bl	__haiku_init_after
+	jal	__haiku_init_after
 
 
 .section .fini
 	// the image ID and program args are still on the stack
-	bl	__haiku_term_after
+	jal	__haiku_term_after