From 82af9de9b6f9ee2cec060e9c379a77b77ee10c80 Mon Sep 17 00:00:00 2001 From: WaluigiWare64 <68647953+WaluigiWare64@users.noreply.github.com> Date: Thu, 24 Dec 2020 15:23:29 +0500 Subject: [PATCH] Fix JIT linkage on ARM64 Macs (#890) --- src/ARMJIT_A64/ARMJIT_Linkage.S | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/ARMJIT_A64/ARMJIT_Linkage.S b/src/ARMJIT_A64/ARMJIT_Linkage.S index 78863155..58b53999 100644 --- a/src/ARMJIT_A64/ARMJIT_Linkage.S +++ b/src/ARMJIT_A64/ARMJIT_Linkage.S @@ -8,8 +8,13 @@ .p2align 4,,15 +#ifdef __APPLE__ +.global _ARM_Dispatch +_ARM_Dispatch: +#else .global ARM_Dispatch ARM_Dispatch: +#endif stp x19, x20, [sp, #-96]! stp x21, x22, [sp, #16] stp x23, x24, [sp, #32] @@ -25,8 +30,13 @@ ARM_Dispatch: .p2align 4,,15 +#ifdef __APPLE__ +.global _ARM_Ret +_ARM_Ret: +#else .global ARM_Ret ARM_Ret: +#endif str RCycles, [RCPU, ARM_Cycles_offset] str RCPSR, [RCPU, ARM_CPSR_offset] @@ -65,4 +75,4 @@ ARM_RestoreContext: ldp x17, x18, [sp, #248] mov sp, x17 - br x18 \ No newline at end of file + br x18