Jonathan Wakely b30dad
From 6e2a2b4b309f4f98ece77edc8746fa683a2e05d8 Mon Sep 17 00:00:00 2001
Jonathan Wakely b30dad
From: Oliver Kowalke <oliver.kowalke@gmx.de>
Jonathan Wakely b30dad
Date: Wed, 25 Feb 2015 19:49:30 +0100
Jonathan Wakely b30dad
Subject: [PATCH 48/54] do not use aliases LR and FP for ARM64/gcc
Jonathan Wakely b30dad
Jonathan Wakely b30dad
---
Jonathan Wakely b30dad
 src/asm/jump_arm64_aapcs_elf_gas.S | 6 +++---
Jonathan Wakely b30dad
 1 file changed, 3 insertions(+), 3 deletions(-)
Jonathan Wakely b30dad
Jonathan Wakely b30dad
diff --git a/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S b/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S
Jonathan Wakely b30dad
index 889008f..09bd7b5 100644
Jonathan Wakely b30dad
--- a/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S
Jonathan Wakely b30dad
+++ b/libs/context/src/asm/jump_arm64_aapcs_elf_gas.S
Jonathan Wakely b30dad
@@ -83,10 +83,10 @@ jump_fcontext:
Jonathan Wakely b30dad
     stp  x23, x24, [sp, #0x60]
Jonathan Wakely b30dad
     stp  x25, x26, [sp, #0x70]
Jonathan Wakely b30dad
     stp  x27, x28, [sp, #0x80]
Jonathan Wakely b30dad
-    stp  fp,  lr,  [sp, #0x90]
Jonathan Wakely b30dad
+    stp  x29, x30, [sp, #0x90]
Jonathan Wakely b30dad
 
Jonathan Wakely b30dad
     # save LR as PC
Jonathan Wakely b30dad
-    str  lr, [sp, #0xa0]
Jonathan Wakely b30dad
+    str  x30, [sp, #0xa0]
Jonathan Wakely b30dad
 
Jonathan Wakely b30dad
     # store RSP (pointing to context-data) in first argument (x0).
Jonathan Wakely b30dad
     # STR cannot have sp as a target register
Jonathan Wakely b30dad
@@ -113,7 +113,7 @@ jump_fcontext:
Jonathan Wakely b30dad
     ldp  x23, x24, [sp, #0x60]
Jonathan Wakely b30dad
     ldp  x25, x26, [sp, #0x70]
Jonathan Wakely b30dad
     ldp  x27, x28, [sp, #0x80]
Jonathan Wakely b30dad
-    ldp  fp,  lr,  [sp, #0x90]
Jonathan Wakely b30dad
+    ldp  x29, x30, [sp, #0x90]
Jonathan Wakely b30dad
 
Jonathan Wakely b30dad
     # use third arg as return value after jump
Jonathan Wakely b30dad
     # and as first arg in context function
Jonathan Wakely b30dad
-- 
Jonathan Wakely b30dad
2.3.5
Jonathan Wakely b30dad