From 9b4dd2e311145fb421bf9958ba85d4d5f9f17376 Mon Sep 17 00:00:00 2001
From: Michael Abbott <michael.abbott@diamond.ac.uk>
Date: Wed, 17 Sep 2025 10:13:20 +0100
Subject: [PATCH] Change ARM code to use position independent code

This is all arising from issue #68 and PR #76.  It seems that MacOS Arm64
does not like the use of relocation in the original switch-arm64.c code.
This arises from a single instruction
    ldr lr, =action_entry

As action_entry is extremely close to this code this can simply be replaced
with
    adr lr, action_entry
for both ARM32 and ARM64.
---
 context/switch-arm.c   | 2 +-
 context/switch-arm64.c | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/context/switch-arm.c b/context/switch-arm.c
index 15ef951c..abd9d74e 100644
--- a/context/switch-arm.c
+++ b/context/switch-arm.c
@@ -68,7 +68,7 @@ FSIZE(switch_frame)
 FNAME(create_frame)
 "       stmfd   r0!, {r1, r2}\n"       // Save arguments for new coroutine
 "       mov     ip, lr\n"              // Save LR so can use same STM slot
-"       ldr     lr, =action_entry\n"
+"       adr     lr, action_entry\n"
 "       stmfd   r0!, {r4, r5, r6, r7, r8, r9, sl, fp, lr}\n"
 IF_VFP_FP(
 "       fstmfdd r0!, {d8-d15}\n")
diff --git a/context/switch-arm64.c b/context/switch-arm64.c
index 9b1fbf4b..a11512b8 100644
--- a/context/switch-arm64.c
+++ b/context/switch-arm64.c
@@ -105,7 +105,12 @@ FSIZE(switch_frame)
 FNAME(create_frame)
 "       stp x1, x2, [x0, #-16]!\n"
 "       mov x16, lr\n"               // Save LR so can use same STP slot
-"       ldr lr, =action_entry\n"
+        // This should be simply
+        //  adr lr,action_entry
+        // but it would appear that on Apple the target for adr needs to be both
+        // local AND known at the instant it is seen by the assembler.  The
+        // reference .1f is an alias for action_entry below to work around this
+"       adr lr, .1f\n"
 "       stp x19, x20, [x0, #-16]!\n"
 "       stp x21, x22, [x0, #-16]!\n"
 "       stp x23, x24, [x0, #-16]!\n"
@@ -118,6 +123,7 @@ FNAME(create_frame)
 "       stp d14, d15, [x0, #-16]!\n"
 "       br  x16\n"
 
+"1:\n"
 "action_entry:\n"
         // Receive control after first switch to new frame.  Top of stack has
         // the saved context and routine to call, switch argument is in r0.