Merge branch 'main' into outbound/projmgr-list-packs-locked

Author: brondani

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

@@ -162,6 +162,8 @@ elseif(CPU STREQUAL "Star-MC1")
       set(ARMASM_CPU "--cpu=Star-MC1")
     endif()
   endif()
+elseif(CPU STREQUAL "Star-MC3")
+  set(ARMASM_CPU " ")
 elseif(CPU STREQUAL "Cortex-M35P")
   if(FPU STREQUAL "NO_FPU")
     if(DSP STREQUAL "NO_DSP")
@@ -400,6 +402,43 @@ elseif(CPU STREQUAL "Cortex-M35P")
       set(ARMCLANG_CPU "-mcpu=Cortex-M35P+nodsp -mfpu=none")
     endif()
   endif()
+elseif(CPU STREQUAL "Star-MC3")
+  message("Star-MC3 support using Cortex-M52 compatibility mode.")
+  set(ARMCLANG_ARCH "armv8.1m.main")
+  set(CPU_FEATURES "Cortex-M52")
+  if(MVE STREQUAL "NO_MVE")
+    if(FPU STREQUAL "NO_FPU")
+      set(CPU_FEATURES "${CPU_FEATURES}+nomve+nofp")
+    elseif(FPU STREQUAL "SP_FPU")
+      set(CPU_FEATURES "${CPU_FEATURES}+nomve+nofp.dp")
+    elseif(FPU STREQUAL "DP_FPU")
+      set(CPU_FEATURES "${CPU_FEATURES}+nomve")
+    endif()
+  elseif(MVE STREQUAL "INT_MVE")
+    if(FPU STREQUAL "NO_FPU")
+      set(CPU_FEATURES "${CPU_FEATURES}+nomve.fp+nofp")
+    elseif(FPU STREQUAL "SP_FPU")
+      set(CPU_FEATURES "${CPU_FEATURES}+nomve.fp+nofp.dp")
+    elseif(FPU STREQUAL "DP_FPU")
+      message(FATAL_ERROR "Error: Cortex-M52+nomve.fp is not supported!")
+    endif()
+  elseif(MVE STREQUAL "FP_MVE")
+    if(FPU STREQUAL "NO_FPU")
+      message(FATAL_ERROR "Error: Cortex-M52+nofp is not supported!")
+    elseif(FPU STREQUAL "SP_FPU")
+      message(FATAL_ERROR "Error: Cortex-M52+nofp.dp is not supported!")
+    elseif(FPU STREQUAL "DP_FPU")
+      set(CPU_FEATURES "${CPU_FEATURES}")
+    endif()
+  endif()
+  if(PACBTI STREQUAL "NO_PACBTI")
+    set(CPU_FEATURES "${CPU_FEATURES}+nopacbti")
+  endif()
+  if(FPU STREQUAL "NO_FPU")
+    set(ARMCLANG_CPU "-mcpu=${CPU_FEATURES}")
+  else()
+    set(ARMCLANG_CPU "-mcpu=${CPU_FEATURES} -mfloat-abi=hard")
+  endif()
 elseif(CPU STREQUAL "Cortex-M52")
   set(ARMCLANG_ARCH "armv8.1m.main")
   set(CPU_FEATURES "Cortex-M52")

tools/buildmgr/cbuildgen/config/GCC.10.3.1.cmake

@@ -147,6 +147,23 @@ elseif(CPU STREQUAL "Cortex-M35P")
       set(GNUASM_CPU "-mcpu=cortex-m35p+nodsp")
     endif()
   endif()
+elseif(CPU STREQUAL "Star-MC3")
+  message("Star-MC3 support using Cortex-M52 compatibility mode.")
+  if(FPU STREQUAL "NO_FPU")
+    if(MVE STREQUAL "NO_MVE")
+      set(GNUASM_CPU "-mcpu=cortex-m52+nofp+nomve")
+    else()
+      set(GNUASM_CPU "-mcpu=cortex-m52+nofp")
+    endif()
+  else()
+    if(MVE STREQUAL "NO_MVE")
+      set(GNUASM_CPU "-mcpu=cortex-m52+nomve -mfloat-abi=hard")
+    elseif(MVE STREQUAL "MVE")
+      set(GNUASM_CPU "-mcpu=cortex-m52+nomve.fp -mfloat-abi=hard")
+    else()
+      set(GNUASM_CPU "-mcpu=cortex-m52 -mfloat-abi=hard")
+    endif()
+  endif()
 elseif(CPU STREQUAL "Cortex-M55")
   if(FPU STREQUAL "NO_FPU")
     if(MVE STREQUAL "NO_MVE")