commit 24ea040d52435b8108d909caf84f0f24b2b936e1
author Måns Nilsson <mans.nilsson@arm.com> Wed Jan 31 09:04:32 2024 +0100
committer Jonny Svärd <jonny.svaerd@arm.com> Thu Feb 01 15:50:08 2024 +0000
tree d2c3ba8bba8de1a4000bb589adfded6bbde0483f
parent f44f8b2cf03a537da13698dba1fe09c2e0251352

Remove GCC workaround for Arm(R) Cortex(R)-M85 CPU

Change-Id: I03285b3ee554450016023b1d9cb331e10dfada2d
Signed-off-by: Måns Nilsson <mans.nilsson@arm.com>

cmake/toolchain/arm-none-eabi-gcc.cmake

diff --git a/cmake/toolchain/arm-none-eabi-gcc.cmake b/cmake/toolchain/arm-none-eabi-gcc.cmake
index 093005e..5ad7d0f 100644
--- a/cmake/toolchain/arm-none-eabi-gcc.cmake
+++ b/cmake/toolchain/arm-none-eabi-gcc.cmake
@@ -1,6 +1,5 @@
 #
-# Copyright (c) 2020-2022 Arm Limited. All rights reserved.
-#
+# SPDX-FileCopyrightText: Copyright 2020-2022, 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
 # SPDX-License-Identifier: Apache-2.0
 #
 # Licensed under the Apache License, Version 2.0 (the License); you may
@@ -35,12 +34,9 @@
 set(CMAKE_C_STANDARD 11)
 set(CMAKE_CXX_STANDARD 14)
 
-set(GCC_CPU ${CMAKE_SYSTEM_PROCESSOR})
-string(REPLACE "cortex-m85" "cortex-m55" GCC_CPU ${GCC_CPU})
-
 # Compile options
 add_compile_options(
-    -mcpu=${GCC_CPU}
+    -mcpu=${CMAKE_SYSTEM_PROCESSOR}
     -mthumb
     "$<$<CONFIG:DEBUG>:-gdwarf-3>"
     "$<$<COMPILE_LANGUAGE:CXX>:-fno-unwind-tables;-fno-rtti;-fno-exceptions>"
@@ -53,7 +49,7 @@
 
 # Link options
 add_link_options(
-    -mcpu=${GCC_CPU}
+    -mcpu=${CMAKE_SYSTEM_PROCESSOR}
     -mthumb
     --specs=nosys.specs)