summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--coroutine/arm64/Context.S6
1 files changed, 5 insertions, 1 deletions
diff --git a/coroutine/arm64/Context.S b/coroutine/arm64/Context.S
index 2cf3e48987..0eb08e326d 100644
--- a/coroutine/arm64/Context.S
+++ b/coroutine/arm64/Context.S
@@ -28,8 +28,12 @@
PREFIXED_SYMBOL(SYMBOL_PREFIX,coroutine_transfer):
#if defined(__ARM_FEATURE_PAC_DEFAULT) && (__ARM_FEATURE_PAC_DEFAULT != 0)
- # paciasp
+ # paciasp (it also acts as BTI landing pad, so no need to insert BTI also)
hint #25
+#elif defined(__ARM_FEATURE_BTI_DEFAULT) && (__ARM_FEATURE_BTI_DEFAULT != 0)
+ # For the the case PAC is not enabled but BTI is.
+ # bti c
+ hint #34
#endif
# Make space on the stack for caller registers
sub sp, sp, 0xb0