Skip to content

CMake: Correct ARM toolchain MCU core flags #14185

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 25, 2021
Merged

CMake: Correct ARM toolchain MCU core flags #14185

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-A9.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-mno-unaligned-access"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-a9"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-A9"
)
list(APPEND link_options
"--cpu=Cortex-A9"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M0+.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-mcpu=cortex-m0plus"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m0plus"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M0plus"
)
list(APPEND link_options
"--cpu=Cortex-M0plus"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M0.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-mcpu=cortex-m0"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m0"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M0"
)
list(APPEND link_options
"--cpu=Cortex-M0"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M1.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-mthumb"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m1"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M1"
)
list(APPEND link_options
"--cpu=Cortex-M1"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M23-NS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-mthumb"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m23"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M23"
)
list(APPEND link_options
"--cpu=Cortex-M23"
)
endif()


Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M23.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-mthumb"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m23"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M23"
)
list(APPEND link_options
"--cpu=Cortex-M23"
)
endif()


Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M3.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-mcpu=cortex-m3"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m3"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M3"
)
list(APPEND link_options
"--cpu=Cortex-M3"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M33F-NS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,11 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-march=armv8-m.main"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m33+nodsp"
"-mfpu=fpv5-sp-d16"
"-mfloat-abi=hard"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M33.no_dsp"
)
list(APPEND link_options
"--cpu=Cortex-M33.no_dsp"
)
endif()


Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M33F.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,11 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-march=armv8-m.main"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m33+nodsp"
"-mfpu=fpv5-sp-d16"
"-mfloat-abi=hard"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M33.no_dsp"
)
list(APPEND link_options
"--cpu=Cortex-M33.no_dsp"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M33FE-NS.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-march=armv8-m.main+dsp"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m33"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M33"
)
list(APPEND link_options
"--cpu=Cortex-M33"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M33FE.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,9 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-march=armv8-m.main+dsp"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m33"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M33"
)
list(APPEND link_options
"--cpu=Cortex-M33"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M4.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,10 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-mcpu=cortex-m4"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m4"
"-mfpu=none"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M4.no_fp"
)
list(APPEND link_options
"--cpu=Cortex-M4.no_fp"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M4F.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,11 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-mfloat-abi=softfp"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m4"
"-mfpu=fpv4-sp-d16"
"-mfloat-abi=hard"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M4"
)
list(APPEND link_options
"--cpu=Cortex-M4"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M7.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,10 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-mcpu=cortex-m7"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m7"
"-mfpu=none"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M7.no_fp"
)
list(APPEND link_options
"--cpu=Cortex-M7.no_fp"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down
8 changes: 1 addition & 7 deletions tools/cmake/cores/Cortex-M7FD.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,11 @@ if(${MBED_TOOLCHAIN} STREQUAL "GCC_ARM")
"-mcpu=cortex-m7"
)
elseif(${MBED_TOOLCHAIN} STREQUAL "ARM")
list(APPEND c_cxx_compile_options
list(APPEND common_options
"-mcpu=cortex-m7"
"-mfpu=fpv5-d16"
"-mfloat-abi=hard"
)
list(APPEND asm_compile_options
"-mcpu=Cortex-M7"
)
list(APPEND link_options
"--cpu=Cortex-M7"
)
endif()

function(mbed_set_cpu_core_definitions target)
Expand Down