Skip to content

Commit f18622e

Browse files
urutvahugueskamba
authored andcommitted
cmake: Fix arm compiler build failures
Update arm compiler flags which were causing build failures. Remove `-MMD` flag as it is not recognised by the Arm compiler. There are no common flags between compiler, assembler and linker. The compiler expects `-mcpu` whereas assembler and linker expects `--cpu`. The `COMMON_FLAGS` in `cmake/toolchains/ARM.cmake` are not recognised by assembler and linker. Signed-off-by: Devaraj Ranganna <devaraj.ranganna@arm.com>
1 parent 915d552 commit f18622e

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

cmake/cores/Cortex-M4F.cmake

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
2828
elseif(MBED_TOOLCHAIN STREQUAL "ARM")
2929

3030
set(ARM_FLAGS " \
31-
--cpu=Cortex-M4.fp.sp \
31+
-mcpu=cortex-m4 \
32+
-mfpu=fpv4-sp-d16 \
33+
-mfloat-abi=hard \
3234
")
3335

3436
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} \
@@ -38,10 +40,10 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
3840
${ARM_FLAGS} \
3941
")
4042
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
41-
${ARM_FLAGS} \
43+
--cpu=Cortex-M4 \
4244
")
4345
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
44-
${ARM_FLAGS} \
46+
--cpu=Cortex-M4 \
4547
")
4648

4749
endif()

cmake/toolchains/ARM.cmake

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ set(COMMON_FLAGS " \
1616
-Wno-deprecated-register \
1717
-fdata-sections \
1818
-fno-exceptions \
19-
-MMD \
2019
-fshort-enums \
2120
-fshort-wchar \
2221
")
@@ -27,10 +26,8 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} \
2726
${COMMON_FLAGS} \
2827
")
2928
set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} \
30-
${COMMON_FLAGS} \
31-
")
32-
set(CMAKE_CXX_LINK_FLAGS "${CMAKE_CXX_LINK_FLAGS} \
33-
${COMMON_FLAGS} \
29+
--cpreproc \
30+
--cpreproc_opts=--target=arm-arm-none-eabi,-mcpu=cortex-m4,-D,__FPU_PRESENT,-D,MBED_CONF_PLATFORM_CRASH_CAPTURE_ENABLED \
3431
")
3532

3633
add_definitions(

0 commit comments

Comments
 (0)