Skip to content

Commit c5c8088

Browse files
author
mean
committed
move -mthumb to overridable vars
1 parent bf82cc4 commit c5c8088

File tree

4 files changed

+5
-5
lines changed

4 files changed

+5
-5
lines changed

ArduinoToolchainStm32.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ set(CMAKE_ASM_COMPILER ${PLATFORM_TOOLCHAIN_PATH}/${STM32_TOOLCHAIN_PREFIX}gcc${
4949
set(CMAKE_CXX_COMPILER ${PLATFORM_TOOLCHAIN_PATH}/${STM32_TOOLCHAIN_PREFIX}g++${TOOLCHAIN_SUFFIX} CACHE PATH "" FORCE)
5050
#set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <FLAGS> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> <OBJECTS> -o <TARGET> <LINK_LIBRARIES>")
5151
# There is probably a cleaner way to do this....
52-
set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> -lgcc -mthumb -Wl,--start-group <OBJECTS> <LINK_LIBRARIES> -Wl,--end-group -o <TARGET> ")
52+
set(CMAKE_CXX_LINK_EXECUTABLE "<CMAKE_CXX_COMPILER> <CMAKE_CXX_LINK_FLAGS> <LINK_FLAGS> -lgcc -Wl,--start-group <OBJECTS> <LINK_LIBRARIES> -Wl,--end-group -o <TARGET> ")
5353
#set(CMAKE_EXE_LINKER_FLAGS "" CACHE INTERNAL "")
5454
#set(CMAKE_CXX_LINK_FLAGS "" CACHE INTERNAL "")
5555
#set(CMAKE_C_LINK_FLAGS "" CACHE INTERNAL "")

Platform/Core/BoardFlags/LinkerFlagsSetterStm32.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
function(set_board_linker_flags LINKER_FLAGS BOARD_ID IS_MANUAL)
33
IF(DEFINED ARDUINO_MCU_FLAGS)
44
ELSE(DEFINED ARDUINO_MCU_FLAGS)
5-
SET(ARDUINO_MCU_FLAGS " -mcpu=cortex-m3")
5+
SET(ARDUINO_MCU_FLAGS " -mcpu=cortex-m3 -mthumb")
66
ENDIF(DEFINED ARDUINO_MCU_FLAGS)
77

88
set(LINK_FLAGS "${LINK_FLAGS} -Os -Wl,--gc-sections ${ARDUINO_MCU_FLAGS} -Xlinker -print-memory-usage ")

Platform/Initialization/DefaultCFlagsStm32.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ IF(NOT DEFINED ARDUINO_CFLAGS_SET)
1313

1414
IF(DEFINED ARDUINO_MCU_FLAGS)
1515
ELSE(DEFINED ARDUINO_MCU_FLAGS)
16-
SET(ARDUINO_MCU_FLAGS " -mcpu=cortex-m3")
16+
SET(ARDUINO_MCU_FLAGS " -mcpu=cortex-m3 -mthumb")
1717
ENDIF(DEFINED ARDUINO_MCU_FLAGS)
1818

19-
SET(ARDUINO_DEFAULT_CFLAGS " -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -w ${ARDUINO_MCU_FLAGS} -mthumb -g ")
19+
SET(ARDUINO_DEFAULT_CFLAGS " -ffunction-sections -fdata-sections -nostdlib --param max-inline-insns-single=500 -w ${ARDUINO_MCU_FLAGS} -g ")
2020
SET(ARDUINO_DEFAULT_CFLAGS " ${ARDUINO_DEFAULT_CFLAGS} -DGENERIC_BOOTLOADER -DF_CPU=${MCU_SPEED}L -DARDUINO_ARCH_STM32F1 -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG ")
2121
#SET(ARDUINO_DEFAULT_CFLAGS " ${ARDUINO_DEFAULT_CFLAGS} -DF_CPU=72000000L -DARDUINO_ARCH_STM32F1 ")
2222

select_mcu_stm32.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ELSEIF(USE_GD32F303)
1818
set(X_ARDUINO_DEFAULT_BOARD genericGD32F303C) # Default Board ID, when not specified
1919
set(X_ARDUINO_CPU GD32F303C8)
2020
# SET(ARDUINO_MCU_FLAGS " -mcpu=cortex-m4 ")
21-
SET(ARDUINO_MCU_FLAGS " -mcpu=cortex-m4 -mfloat-abi=softfp")# -mfpu=fpv4-sp-d16")
21+
SET(ARDUINO_MCU_FLAGS " -mcpu=cortex-m4 -mfloat-abi=softfp -march=armv7 -mthumb")# -mfpu=fpv4-sp-d16")
2222
ADD_DEFINITIONS("-DHIGH_SPEED_ADC")
2323
SET(X_ARDUINO_UPLOAD_METHOD BMP) # Use blackmagic link, if you comment it out you'll use DFU => 8kB flash
2424
ELSE()

0 commit comments

Comments
 (0)