Revert "toolchain: Remove toolchain reset magic"
This reverts commit f8cb57a24e607af0d303689a09a53433040521c3.
Reason for revert: Breaks CI
Change-Id: Ib94231513c780a3cc1e53a29ba596295286bf319
diff --git a/toolchain_GNUARM.cmake b/toolchain_GNUARM.cmake
index 074fac4..bac2286 100644
--- a/toolchain_GNUARM.cmake
+++ b/toolchain_GNUARM.cmake
@@ -48,7 +48,7 @@
endif()
endif()
# GCC specifies that '+nofp' is available on following M-profile cpus: 'cortex-m4',
- # 'cortex-m7', 'cortex-m33', 'cortex-m35p', 'cortex-m55' and 'cortex-m85'.
+ # 'cortex-m7', 'cortex-m33', 'cortex-m35p' and 'cortex-m55'.
# Build fails if other M-profile cpu, such as 'cortex-m23', is added with '+nofp'.
# Explicitly list those cpu to align with GCC description.
if(GCC_VERSION VERSION_GREATER_EQUAL "8.0.0")
@@ -57,8 +57,7 @@
OR TFM_SYSTEM_PROCESSOR STREQUAL "cortex-m7"
OR TFM_SYSTEM_PROCESSOR STREQUAL "cortex-m33"
OR TFM_SYSTEM_PROCESSOR STREQUAL "cortex-m35p"
- OR TFM_SYSTEM_PROCESSOR STREQUAL "cortex-m55"
- OR TFM_SYSTEM_PROCESSOR STREQUAL "cortex-m85"))
+ OR TFM_SYSTEM_PROCESSOR STREQUAL "cortex-m55"))
string(APPEND CMAKE_SYSTEM_PROCESSOR "+nofp")
endif()
endif()
@@ -409,3 +408,7 @@
ARGS $<TARGET_FILE:${dependency}> --wildcard ${SYMBOL_LIST} $<TARGET_FILE:${dependency}>
)
endmacro()
+
+# A dummy macro to align with Armclang workaround
+macro(tfm_toolchain_reload_compiler)
+endmacro()