Skip to content

Commit 0ef2024

Browse files
authored
Merge pull request #14401 from LDong-Arm/m33_link_fix
Workaround for Cortex-M33 Arm toochain linking
2 parents ea4aed2 + 6dc85e0 commit 0ef2024

File tree

2 files changed

+14
-0
lines changed

2 files changed

+14
-0
lines changed

tools/cmake/cores/Cortex-M33-NS.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1212
"-mcpu=cortex-m33+nodsp"
1313
"-mfpu=none"
1414
)
15+
list(APPEND link_options
16+
# Necessary as the linker does not always detect
17+
# the architecture from the objectfiles correctly.
18+
# Also, the complete flag should be "--cpu=Cortex-M33.no_dsp.no_fp"
19+
# but this currently conflicts with CMake's compiler test until fixed
20+
"--cpu=Cortex-M33.no_fp"
21+
)
1522
endif()
1623

1724
function(mbed_set_cpu_core_definitions target)

tools/cmake/cores/Cortex-M33.cmake

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
1212
"-mcpu=cortex-m33+nodsp"
1313
"-mfpu=none"
1414
)
15+
list(APPEND link_options
16+
# Necessary as the linker does not always detect
17+
# the architecture from the objectfiles correctly.
18+
# Also, the complete flag should be "--cpu=Cortex-M33.no_dsp.no_fp"
19+
# but this currently conflicts with CMake's compiler test until fixed
20+
"--cpu=Cortex-M33.no_fp"
21+
)
1522
endif()
1623

1724
function(mbed_set_cpu_core_definitions target)

0 commit comments

Comments
 (0)