summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorJun Nie <jun.nie@linaro.org>2018-08-07 12:27:18 +0800
committerJun Nie <jun.nie@linaro.org>2018-08-07 12:34:06 +0800
commit5a68e2578cf21811bf92a235fbd405135d24b71a (patch)
tree9cbeb715e3cad484e6aef1b39f8858bf2773a1b4 /framework
parentd791077531b4f3d4ab802278266d5311da7a8d43 (diff)
Aarch32: replace ARMv8 only assembly code
Some ARMv8 only assembly is used in aarch32 case, add ARMv7 version assembly code Signed-off-by: Jun Nie <jun.nie@linaro.org>
Diffstat (limited to 'framework')
-rw-r--r--framework/aarch32/exceptions.S4
1 files changed, 4 insertions, 0 deletions
diff --git a/framework/aarch32/exceptions.S b/framework/aarch32/exceptions.S
index 5dbfa33..63e11df 100644
--- a/framework/aarch32/exceptions.S
+++ b/framework/aarch32/exceptions.S
@@ -52,5 +52,9 @@ func tftf_intr_handle
push {r0 - r3, lr}
bl tftf_irq_handler_dispatcher
pop {r0 - r3, lr}
+#if ARM_ARCH_MAJOR == 8
eret
+#else
+ movs pc, lr
+#endif
endfunc tftf_intr_handle