commit e992c781c428c413e0c982e24976f97f02df4ca8
author Nicola Mazzucato <nicola.mazzucato@arm.com> Wed Aug 21 10:12:13 2024 +0100
committer Antonio de Angelis <Antonio.deAngelis@arm.com> Wed Aug 28 11:44:55 2024 +0200
tree c4eb6b2f15d46904ba530caead614510e33eaf67
parent eb8ff0db7d657b77abcd0262d5bf7f38eb1e1cdc

Build: GNUARM: Restrict support for PACBTI to AC6

Restrict the branch protection feature to Arm Compiler 6
because GNUARM lacks full support.

Signed-off-by: Nicola Mazzucato <nicola.mazzucato@arm.com>
Change-Id: I684819d9e68f830a1291f8b47f9bbd21d456ce1f

toolchain_GNUARM.cmake

diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
index 200caeb..bac2286 100644
--- a/toolchain_GNUARM.cmake
+++ b/toolchain_GNUARM.cmake
@@ -126,32 +126,10 @@
 
 #
 # Pointer Authentication Code and Branch Target Identification (PACBTI) Options
+# Not currently supported for GNUARM.
 #
-if (${CONFIG_TFM_BRANCH_PROTECTION_FEAT} STREQUAL BRANCH_PROTECTION_NONE)
-    set(BRANCH_PROTECTION_OPTIONS "none")
-elseif(${CONFIG_TFM_BRANCH_PROTECTION_FEAT} STREQUAL BRANCH_PROTECTION_STANDARD)
-    set(BRANCH_PROTECTION_OPTIONS "standard")
-elseif(${CONFIG_TFM_BRANCH_PROTECTION_FEAT} STREQUAL BRANCH_PROTECTION_PACRET)
-    set(BRANCH_PROTECTION_OPTIONS "pac-ret")
-elseif(${CONFIG_TFM_BRANCH_PROTECTION_FEAT} STREQUAL BRANCH_PROTECTION_PACRET_LEAF)
-    set(BRANCH_PROTECTION_OPTIONS "pac-ret+leaf")
-elseif(${CONFIG_TFM_BRANCH_PROTECTION_FEAT} STREQUAL BRANCH_PROTECTION_BTI)
-    set(BRANCH_PROTECTION_OPTIONS "bti")
-endif()
-
 if(NOT ${CONFIG_TFM_BRANCH_PROTECTION_FEAT} STREQUAL BRANCH_PROTECTION_DISABLED)
-    if(GCC_VERSION VERSION_LESS "12.2")
-        message(FATAL_ERROR "Your compiler does not support BRANCH_PROTECTION")
-    else()
-        if((TFM_SYSTEM_PROCESSOR MATCHES "cortex-m85") AND
-            (TFM_SYSTEM_ARCHITECTURE STREQUAL "armv8.1-m.main"))
-            message(NOTICE "BRANCH_PROTECTION enabled with: ${BRANCH_PROTECTION_OPTIONS}")
-
-            add_compile_options(-mbranch-protection=${BRANCH_PROTECTION_OPTIONS})
-        else()
-            message(FATAL_ERROR "Your architecture does not support BRANCH_PROTECTION")
-        endif()
-    endif()
+    message(FATAL_ERROR "BRANCH_PROTECTION NOT supported for GNU-ARM")
 endif()
 
 add_link_options(