From 05a1f02730374b33f6fbe73b4d7553f9d2e6137c Mon Sep 17 00:00:00 2001 From: Dirk Helbig Date: Tue, 17 Sep 2024 09:35:32 +0200 Subject: [PATCH] stm32_f4discovery_cc256x: fix binary size regression --- port/stm32-f4discovery-cc256x/CMakeLists.txt | 2 +- .../cmake/gcc-arm-none-eabi.cmake | 18 +++++++++++------- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/port/stm32-f4discovery-cc256x/CMakeLists.txt b/port/stm32-f4discovery-cc256x/CMakeLists.txt index d75b7c3a6..7c3508fa9 100644 --- a/port/stm32-f4discovery-cc256x/CMakeLists.txt +++ b/port/stm32-f4discovery-cc256x/CMakeLists.txt @@ -19,7 +19,7 @@ if(NOT CMAKE_BUILD_TYPE) endif() # Set the project name -set(CMAKE_PROJECT_NAME stm32f4-discovery-nrf5340) +set(CMAKE_PROJECT_NAME stm32f4-discovery-cc256x) # Include toolchain file include("cmake/gcc-arm-none-eabi.cmake") diff --git a/port/stm32-f4discovery-cc256x/cmake/gcc-arm-none-eabi.cmake b/port/stm32-f4discovery-cc256x/cmake/gcc-arm-none-eabi.cmake index 66a57c6a1..10e44928c 100644 --- a/port/stm32-f4discovery-cc256x/cmake/gcc-arm-none-eabi.cmake +++ b/port/stm32-f4discovery-cc256x/cmake/gcc-arm-none-eabi.cmake @@ -24,16 +24,20 @@ set(CMAKE_EXECUTABLE_SUFFIX_CXX ".elf") set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) # MCU specific flags -set(TARGET_FLAGS "-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard ") +set(TARGET_FLAGS "-mcpu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${TARGET_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wpedantic -fdata-sections -ffunction-sections") -if(CMAKE_BUILD_TYPE MATCHES Debug) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Og -g3") -endif() -if(CMAKE_BUILD_TYPE MATCHES Release) - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Os -g3") -endif() + +set(CMAKE_C_FLAGS_RELEASE "-Oz -g3 -DNDEBUG" CACHE STRING "") +set(CMAKE_C_FLAGS_MINSIZEREL "-Oz -g3 -DNDEBUG" CACHE STRING "") +set(CMAKE_C_FLAGS_RELWITHDEBINFO "-Oz -g3 -DNDEBUG" CACHE STRING "") +set(CMAKE_C_FLAGS_DEBUG "-Og -g3" CACHE STRING "") + +set(CMAKE_ASM_FLAGS_RELEASE "-Oz -g3 -DNDEBUG" CACHE STRING "") +set(CMAKE_ASM_FLAGS_MINSIZEREL "-Oz -g3 -DNDEBUG" CACHE STRING "") +set(CMAKE_ASM_FLAGS_RELWITHDEBINFO "-Oz -g3 -DNDEBUG" CACHE STRING "") +set(CMAKE_ASM_FLAGS_DEBUG "-Og -g3" CACHE STRING "") set(CMAKE_ASM_FLAGS "${CMAKE_C_FLAGS} -x assembler-with-cpp -MMD -MP") set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fno-rtti -fno-exceptions -fno-threadsafe-statics")