From eb4dd41b4264c303a1d972164de43d411cd1c82a Mon Sep 17 00:00:00 2001 From: Alexander von Gluck IV Date: Wed, 5 Dec 2018 10:30:42 -0600 Subject: [PATCH] system/glue: Get your arm outta my risc! Change-Id: Ie000430275df9be5568d7d8e330743120691ac4f --- src/system/glue/arch/riscv32/crti.S | 4 ++-- src/system/glue/arch/riscv32/crtn.S | 4 ++-- src/system/glue/arch/riscv64/crti.S | 4 ++-- src/system/glue/arch/riscv64/crtn.S | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) 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