Deciding to still to single toolchain-gcc.cmake file and just allow for toolchain overload selection.

Author: BujSet

.github/workflows/trunk.yml

@@ -259,7 +259,10 @@ jobs:
 
         # User toolchain
         ${toolchain_prefix}c++ --version
-        toolchain_cmake=examples/arm/ethos-u-setup/arm-eabi-gcc.cmake
+
+        # We will use the the bare metal default, specify to use the 
+        # arm zephyr toolchain if we need to
+        toolchain_cmake=examples/arm/ethos-u-setup/arm-eabi-none-gcc.cmake
         toolchain_cmake=$(realpath ${toolchain_cmake})
 
         # Build and test size test

CMakePresets.json

@@ -114,7 +114,7 @@
         "cacheVariables": {
             "EXECUTORCH_BUILD_PRESET_FILE": "${sourceDir}/tools/cmake/preset/zephyr.cmake",
 	    "ARM_TOOLCHAIN_NAME": "zephyr",
-            "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/examples/arm/ethos-u-setup/arm-eabi-gcc.cmake"
+            "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/examples/arm/ethos-u-setup/arm-none-eabi-gcc.cmake"
         }
     }
   ]

examples/arm/ethos-u-setup/arm-eabi-gcc.cmake

@@ -25,6 +25,12 @@ set(TARGET_CPU
 )
 string(TOLOWER ${TARGET_CPU} CMAKE_SYSTEM_PROCESSOR)
 
+if(ARM_TOOLCHAIN_NAME MATCHES "^zephyr")
+    set(CMAKE_ARM_ARCH_ABI arm-zephyr-eabi)
+else()
+    set(CMAKE_ARM_ARCH_ABI arm-none-eabi)
+endif()
+
 set(CMAKE_SYSTEM_NAME Generic)
 set(CMAKE_C_COMPILER "arm-none-eabi-gcc")
 set(CMAKE_CXX_COMPILER "arm-none-eabi-g++")
@@ -101,3 +107,11 @@ add_compile_options(
   -Wno-error=shift-count-overflow
   -Wno-psabi
 )
+
+if (CMAKE_ARM_ARCH_ABI STREQUAL "arm-zephyr-eabi")
+  add_compile_options(
+    -Wno-stringop-overread
+    -Wno-error=format=
+    -Wno-error=maybe-uninitialized
+  )
+endif()

examples/arm/ethos-u-setup/arm-none-eabi-gcc.cmake

@@ -224,7 +224,7 @@ function setup_fvp() {
 }
 
 function setup_toolchain() {
-    # Download and install the arm-none-eabi toolchain
+    # Download and install the arm toolchain (default is arm-none-eabi)
     cd "${root_dir}"
     local selected_toolchain_url="${toolchain_url}"
     local selected_toolchain_dir="${toolchain_dir}"

examples/arm/ethos-u-setup/arm-zephyr-eabi-gcc.cmake

@@ -23,16 +23,15 @@ cmake_install_executorch_lib() {
   update_tokenizers_git_submodule
   local EXTRA_BUILD_ARGS="${@}"
 
-#  CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DBUCK2="$BUCK2" \
-#          -DCMAKE_CXX_STANDARD_REQUIRED=ON \
-#          -DCMAKE_INSTALL_PREFIX=cmake-out \
-#          -DCMAKE_BUILD_TYPE=Release \
-#          -DEXECUTORCH_BUILD_EXECUTOR_RUNNER=OFF \
-#          -DEXECUTORCH_OPTIMIZE_SIZE=ON \
-#          -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
-#          ${EXTRA_BUILD_ARGS} \
-#          -Bcmake-out .
-  cmake --preset zephyr ${EXTRA_BUILD_ARGS} -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out .
+  CXXFLAGS="$COMMON_CXXFLAGS" retry cmake -DBUCK2="$BUCK2" \
+          -DCMAKE_CXX_STANDARD_REQUIRED=ON \
+          -DCMAKE_INSTALL_PREFIX=cmake-out \
+          -DCMAKE_BUILD_TYPE=Release \
+          -DEXECUTORCH_BUILD_EXECUTOR_RUNNER=OFF \
+          -DEXECUTORCH_OPTIMIZE_SIZE=ON \
+          -DPYTHON_EXECUTABLE="$PYTHON_EXECUTABLE" \
+          ${EXTRA_BUILD_ARGS} \
+          -Bcmake-out .
   cmake --build cmake-out -j9 --target install --config Release
 }
 
@@ -41,7 +40,7 @@ test_cmake_size_test() {
         -DCMAKE_INSTALL_PREFIX=cmake-out \
         ${EXTRA_BUILD_ARGS} \
         -Bcmake-out/test test
-#    cmake --preset zephyr ${EXTRA_BUILD_ARGS} -DCMAKE_BUILD_TYPE=Release  -DCMAKE_INSTALL_PREFIX=cmake-out -Bcmake-out/test test
+
     echo "Build size test"
     cmake --build cmake-out/test -j9 --config Release