coroutine/arm64/Context.S: Insert bti c as BTI landing pad

ruby · Dec 22, 2023 · 3558715 · 3558715
1 parent d9e5564
commit 3558715
Showing 1 changed file with 5 additions and 1 deletion.
diff --git 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