Skip to content

Commit 93ce883

Browse files
Add support for Star-MC3 and correct the support of Cortex-M52
1 parent e54ad06 commit 93ce883

File tree

2 files changed

+59
-14
lines changed

2 files changed

+59
-14
lines changed

tools/buildmgr/cbuildgen/config/AC6.6.16.2.cmake

Lines changed: 23 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -402,31 +402,40 @@ elseif(CPU STREQUAL "Cortex-M35P")
402402
endif()
403403
elseif(CPU STREQUAL "Cortex-M52")
404404
set(ARMCLANG_ARCH "armv8.1m.main")
405+
set(CPU_FEATURES "Cortex-M52")
405406
if(MVE STREQUAL "NO_MVE")
406-
if(FPU STREQUAL "DP_FPU")
407-
set(ARMCLANG_CPU "-mcpu=Cortex-M52+nomve -mfloat-abi=hard")
407+
if(FPU STREQUAL "NO_FPU")
408+
set(CPU_FEATURES "${CPU_FEATURES}+nomve+nofp")
408409
elseif(FPU STREQUAL "SP_FPU")
409-
set(ARMCLANG_CPU "-mcpu=Cortex-M52+nomve+nofp.dp -mfloat-abi=hard")
410-
else()
411-
message(FATAL_ERROR "Error: Cortex-M52+nomve+nofp is not supported!")
410+
set(CPU_FEATURES "${CPU_FEATURES}+nomve+nofp.dp")
411+
elseif(FPU STREQUAL "DP_FPU")
412+
set(CPU_FEATURES "${CPU_FEATURES}+nomve")
412413
endif()
413414
elseif(MVE STREQUAL "INT_MVE")
414-
if(FPU STREQUAL "SP_FPU")
415-
set(ARMCLANG_CPU "-mcpu=Cortex-M52+nomve.fp+nofp.dp -mfloat-abi=hard")
415+
if(FPU STREQUAL "NO_FPU")
416+
set(CPU_FEATURES "${CPU_FEATURES}+nomve.fp+nofp")
417+
elseif(FPU STREQUAL "SP_FPU")
418+
set(CPU_FEATURES "${CPU_FEATURES}+nomve.fp+nofp.dp")
416419
elseif(FPU STREQUAL "DP_FPU")
417420
message(FATAL_ERROR "Error: Cortex-M52+nomve.fp is not supported!")
418-
else()
419-
set(ARMCLANG_CPU "-mcpu=Cortex-M52+nomve.fp+nofp")
420421
endif()
421-
else()
422-
if(FPU STREQUAL "DP_FPU")
423-
set(ARMCLANG_CPU "-mcpu=Cortex-M52 -mfloat-abi=hard")
422+
elseif(MVE STREQUAL "FP_MVE")
423+
if(FPU STREQUAL "NO_FPU")
424+
message(FATAL_ERROR "Error: Cortex-M52+nofp is not supported!")
424425
elseif(FPU STREQUAL "SP_FPU")
425426
message(FATAL_ERROR "Error: Cortex-M52+nofp.dp is not supported!")
426-
else()
427-
message(FATAL_ERROR "Error: Cortex-M52+nofp is not supported!")
427+
elseif(FPU STREQUAL "DP_FPU")
428+
set(CPU_FEATURES "${CPU_FEATURES}")
428429
endif()
429430
endif()
431+
if(PACBTI STREQUAL "NO_PACBTI")
432+
set(CPU_FEATURES "${CPU_FEATURES}+nopacbti")
433+
endif()
434+
if(FPU STREQUAL "NO_FPU")
435+
set(ARMCLANG_CPU "-mcpu=${CPU_FEATURES}")
436+
else()
437+
set(ARMCLANG_CPU "-mcpu=${CPU_FEATURES} -mfloat-abi=hard")
438+
endif()
430439
elseif(CPU STREQUAL "Cortex-M55")
431440
set(ARMCLANG_ARCH "armv8.1m.main")
432441
if(FPU STREQUAL "NO_FPU")

tools/buildmgr/cbuildgen/config/CLANG.17.0.1.cmake

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,42 @@ elseif(CPU STREQUAL "Cortex-M52")
195195
set(CLANG_MFPU "fpv5-sp-d16")
196196
set(CLANG_MFLOATABI "hard")
197197
endif()
198+
elseif(CPU STREQUAL "Star-MC3")
199+
set(CLANG_ARCH "armv8.1m.main")
200+
set(CPU_FEATURES "Star-MC3")
201+
if(MVE STREQUAL "NO_MVE")
202+
if(FPU STREQUAL "NO_FPU")
203+
set(CPU_FEATURES "${CPU_FEATURES}+nomve+nofp")
204+
elseif(FPU STREQUAL "SP_FPU")
205+
set(CPU_FEATURES "${CPU_FEATURES}+nomve+nofp.dp")
206+
elseif(FPU STREQUAL "DP_FPU")
207+
set(CPU_FEATURES "${CPU_FEATURES}+nomve")
208+
endif()
209+
elseif(MVE STREQUAL "INT_MVE")
210+
if(FPU STREQUAL "NO_FPU")
211+
set(CPU_FEATURES "${CPU_FEATURES}+nomve.fp+nofp")
212+
elseif(FPU STREQUAL "SP_FPU")
213+
set(CPU_FEATURES "${CPU_FEATURES}+nomve.fp+nofp.dp")
214+
elseif(FPU STREQUAL "DP_FPU")
215+
message(FATAL_ERROR "Error: Star-MC3+nomve.fp is not supported!")
216+
endif()
217+
elseif(MVE STREQUAL "FP_MVE")
218+
if(FPU STREQUAL "NO_FPU")
219+
message(FATAL_ERROR "Error: Star-MC3+nofp is not supported!")
220+
elseif(FPU STREQUAL "SP_FPU")
221+
message(FATAL_ERROR "Error: Star-MC3+nofp.dp is not supported!")
222+
elseif(FPU STREQUAL "DP_FPU")
223+
set(CPU_FEATURES "${CPU_FEATURES}")
224+
endif()
225+
endif()
226+
if(PACBTI STREQUAL "NO_PACBTI")
227+
set(CPU_FEATURES "${CPU_FEATURES}+nopacbti")
228+
endif()
229+
if(FPU STREQUAL "NO_FPU")
230+
set(CLANG_MCPU "-mcpu=${CPU_FEATURES}")
231+
else()
232+
set(CLANG_MCPU "-mcpu=${CPU_FEATURES} -mfloat-abi=hard")
233+
endif()
198234
elseif(CPU STREQUAL "Cortex-M55")
199235
set(CLANG_ARCH "armv8.1m.main")
200236
if(FPU STREQUAL "NO_FPU")

0 commit comments

Comments
 (0)