From 941a2d46a5b899c536cad245b454699e4ed9e23e Mon Sep 17 00:00:00 2001
From: Gabe Black <gabeblack@google.com>
Date: Thu, 9 Apr 2020 23:57:45 -0700
Subject: [PATCH] util: Fix interworking for the thumb version of the m5 util.

Make sure the m5 op call sight is marked as thumb, and also use an
interworking branch to return from it.

Change-Id: I4f6ec6a0e9e7ff76fc8f256fec9ec410a9959189
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/27748
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
---
 util/m5/src/abi/thumb/m5op.S | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/util/m5/src/abi/thumb/m5op.S b/util/m5/src/abi/thumb/m5op.S
index a8cf7b242..0a0f864e4 100644
--- a/util/m5/src/abi/thumb/m5op.S
+++ b/util/m5/src/abi/thumb/m5op.S
@@ -47,10 +47,11 @@
 .macro m5op_func name, func
         .align 2
         .globl \name
+        .thumb_func
 \name:
         .short 0xEE00 | \func
         .short 0x0110
-        mov pc,lr
+        bx lr
 .endm
 
 .text
-- 
2.30.2