From 24ea040d52435b8108d909caf84f0f24b2b936e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?M=C3=A5ns=20Nilsson?= Date: Wed, 31 Jan 2024 09:04:32 +0100 Subject: Remove GCC workaround for Arm(R) Cortex(R)-M85 CPU MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I03285b3ee554450016023b1d9cb331e10dfada2d Signed-off-by: Måns Nilsson --- cmake/toolchain/arm-none-eabi-gcc.cmake | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) 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 # SPDX-License-Identifier: Apache-2.0 # # Licensed under the Apache License, Version 2.0 (the License); you may @@ -35,12 +34,9 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) 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 "$<$:-gdwarf-3>" "$<$:-fno-unwind-tables;-fno-rtti;-fno-exceptions>" @@ -53,7 +49,7 @@ add_compile_definitions( # Link options add_link_options( - -mcpu=${GCC_CPU} + -mcpu=${CMAKE_SYSTEM_PROCESSOR} -mthumb --specs=nosys.specs) -- cgit v1.2.1