From 4429b47165eeee81fb8300c60a6832898c31db42 Mon Sep 17 00:00:00 2001 From: Chris Kay Date: Tue, 9 Mar 2021 16:01:38 +0000 Subject: [PATCH] refactor(aarch64): remove `FEAT_BTI` architecture check BTI instructions are a part of the NOP space in earlier architecture versions, so it's not inherently incorrect to enable BTI code or instructions even if the target architecture does not support them. This change reduces our reliance on architecture versions when checking for features. Change-Id: I79f884eec3d65978c61e72e4268021040fd6c96e Signed-off-by: Chris Kay --- include/arch/aarch64/asm_macros.S | 4 ---- 1 file changed, 4 deletions(-) diff --git a/include/arch/aarch64/asm_macros.S b/include/arch/aarch64/asm_macros.S index 464c05be1..7706cd831 100644 --- a/include/arch/aarch64/asm_macros.S +++ b/include/arch/aarch64/asm_macros.S @@ -10,10 +10,6 @@ #include #include -#if ENABLE_BTI && !ARM_ARCH_AT_LEAST(8, 5) -#error Branch Target Identification requires ARM_ARCH_MINOR >= 5 -#endif - /* * TLBI instruction with type specifier that implements the workaround for * errata 813419 of Cortex-A57 or errata 1286807 of Cortex-A76.