From a2d17f356feca582fb1a58c11b6cffada83ba471 Mon Sep 17 00:00:00 2001 From: heck Date: Tue, 4 Jul 2023 23:16:30 +0200 Subject: [PATCH] Build: Fix the linker bug file in CMakeLists_template.txt --- .gitignore | 1 + CMakeLists.txt | 73 ----------------------------------------- CMakeLists_template.txt | 8 ++--- 3 files changed, 5 insertions(+), 77 deletions(-) create mode 100644 .gitignore delete mode 100644 CMakeLists.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..93c6b42 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt deleted file mode 100644 index dd922dd..0000000 --- a/CMakeLists.txt +++ /dev/null @@ -1,73 +0,0 @@ -#THIS FILE IS AUTO GENERATED FROM THE TEMPLATE! DO NOT CHANGE! -set(CMAKE_SYSTEM_NAME Generic) -set(CMAKE_SYSTEM_VERSION 1) -cmake_minimum_required(VERSION 3.25) - -# specify cross-compilers and tools -set(CMAKE_C_COMPILER arm-none-eabi-gcc) -set(CMAKE_CXX_COMPILER arm-none-eabi-g++) -set(CMAKE_ASM_COMPILER arm-none-eabi-gcc) -set(CMAKE_AR arm-none-eabi-ar) -set(CMAKE_OBJCOPY arm-none-eabi-objcopy) -set(CMAKE_OBJDUMP arm-none-eabi-objdump) -set(SIZE arm-none-eabi-size) -set(CMAKE_TRY_COMPILE_TARGET_TYPE STATIC_LIBRARY) - -# project settings -project(raw407cxx C CXX ASM) -set(CMAKE_CXX_STANDARD 17) -set(CMAKE_C_STANDARD 11) - -#Uncomment for hardware floating point -add_compile_definitions(ARM_MATH_CM4;ARM_MATH_MATRIX_CHECK;ARM_MATH_ROUNDING) -add_compile_options(-mfloat-abi=hard -mfpu=fpv4-sp-d16) -add_link_options(-mfloat-abi=hard -mfpu=fpv4-sp-d16) - -#Uncomment for software floating point -#add_compile_options(-mfloat-abi=soft) - -add_compile_options(-mcpu=cortex-m4 -mthumb -mthumb-interwork) -add_compile_options(-ffunction-sections -fdata-sections -fno-common -fmessage-length=0) - -# uncomment to mitigate c++17 absolute addresses warnings -#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-register") - -# Enable assembler files preprocessing -add_compile_options($<$:-x$assembler-with-cpp>) - -if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release") - message(STATUS "Maximum optimization for speed") - add_compile_options(-Ofast) -elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "RelWithDebInfo") - message(STATUS "Maximum optimization for speed, debug info included") - add_compile_options(-Ofast -g) -elseif ("${CMAKE_BUILD_TYPE}" STREQUAL "MinSizeRel") - message(STATUS "Maximum optimization for size") - add_compile_options(-Os) -else () - message(STATUS "Minimal optimization, debug info included") - add_compile_options(-Og -g) -endif () - -include_directories(Core/Inc Drivers/STM32F4xx_HAL_Driver/Inc Drivers/STM32F4xx_HAL_Driver/Inc/Legacy Drivers/CMSIS/Device/ST/STM32F4xx/Include Drivers/CMSIS/Include) - -add_definitions(-DDEBUG -DUSE_HAL_DRIVER -DSTM32F407xx) - -file(GLOB_RECURSE SOURCES "Core/*.*" "Drivers/*.*") - -set(LINKER_SCRIPT ${CMAKE_SOURCE_DIR}/STM32F407VGTX_FLASH.ld) - -add_link_options(-Wl,-gc-sections,--print-memory-usage,-Map=${PROJECT_BINARY_DIR}/${PROJECT_NAME}.map) -add_link_options(-mcpu=cortex-m4 -mthumb -mthumb-interwork) -add_link_options(-T ${LINKER_SCRIPT}) - -add_executable(${PROJECT_NAME}.elf ${SOURCES} ${LINKER_SCRIPT}) - -set(HEX_FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.hex) -set(BIN_FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.bin) - -add_custom_command(TARGET ${PROJECT_NAME}.elf POST_BUILD - COMMAND ${CMAKE_OBJCOPY} -Oihex $ ${HEX_FILE} - COMMAND ${CMAKE_OBJCOPY} -Obinary $ ${BIN_FILE} - COMMENT "Building ${HEX_FILE} -Building ${BIN_FILE}") diff --git a/CMakeLists_template.txt b/CMakeLists_template.txt index 3b7fc44..e31b5f2 100644 --- a/CMakeLists_template.txt +++ b/CMakeLists_template.txt @@ -18,9 +18,9 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_C_STANDARD 11) #Uncomment for hardware floating point -#add_compile_definitions(ARM_MATH_CM4;ARM_MATH_MATRIX_CHECK;ARM_MATH_ROUNDING) -#add_compile_options(-mfloat-abi=hard -mfpu=fpv4-sp-d16) -#add_link_options(-mfloat-abi=hard -mfpu=fpv4-sp-d16) +add_compile_definitions(ARM_MATH_CM4;ARM_MATH_MATRIX_CHECK;ARM_MATH_ROUNDING) +add_compile_options(-mfloat-abi=hard -mfpu=fpv4-sp-d16) +add_link_options(-mfloat-abi=hard -mfpu=fpv4-sp-d16) #Uncomment for software floating point #add_compile_options(-mfloat-abi=soft) @@ -54,7 +54,7 @@ add_definitions(${defines}) file(GLOB_RECURSE SOURCES ${sources}) -set(LINKER_SCRIPT $${CMAKE_SOURCE_DIR}/${linkerScript}) +set(LINKER_SCRIPT $${CMAKE_SOURCE_DIR}/STM32F407VGTX_FLASH.ld) add_link_options(-Wl,-gc-sections,--print-memory-usage,-Map=$${PROJECT_BINARY_DIR}/$${PROJECT_NAME}.map) add_link_options(-mcpu=${mcpu} -mthumb -mthumb-interwork)