Skip to content

Commit 4c568ce

Browse files
Merge branch 'main' into validate_manifest
2 parents 597cf2c + 2649109 commit 4c568ce

3 files changed

Lines changed: 17 additions & 10 deletions

File tree

.github/workflows/pull.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ jobs:
547547
setup_script_args=""
548548
if [[ ${{ matrix.os}} == "bare_metal" ]]; then
549549
toolchain_prefix=arm-none-eabi-
550-
threshold="111000" # 111 KiB
550+
threshold="118000" # GCC 15.2 baseline: 115868 bytes, 2026-05-13
551551
toolchain_cmake=examples/arm/ethos-u-setup/arm-none-eabi-gcc.cmake
552552
elif [[ ${{ matrix.os}} == "zephyr-preset" ]]; then
553553
setup_script_args="--target-toolchain zephyr"

backends/arm/scripts/toolchain_utils.sh

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,20 +22,20 @@ source "${script_dir}/utils.sh"
2222

2323
function gcc_select_toolchain() {
2424
if [[ "${ARCH}" == "x86_64" ]] ; then
25-
toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi.tar.xz"
26-
toolchain_dir="arm-gnu-toolchain-13.3.rel1-x86_64-arm-none-eabi"
27-
toolchain_md5_checksum="0601a9588bc5b9c99ad2b56133b7f118"
25+
toolchain_url="https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi.tar.xz"
26+
toolchain_dir="arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi"
27+
toolchain_md5_checksum="da62bef8821e7fc2a9b5d023871036e0"
2828
toolchain_archive="${toolchain_dir}.tar.xz"
2929
elif [[ "${ARCH}" == "aarch64" ]] || [[ "${ARCH}" == "arm64" ]] ; then
3030
if [[ "${OS}" == "Darwin" ]]; then
31-
toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi.tar.xz"
32-
toolchain_dir="arm-gnu-toolchain-13.3.rel1-darwin-arm64-arm-none-eabi"
33-
toolchain_md5_checksum="f1c18320bb3121fa89dca11399273f4e"
31+
toolchain_url="https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-darwin-arm64-arm-none-eabi.tar.xz"
32+
toolchain_dir="arm-gnu-toolchain-15.2.rel1-darwin-arm64-arm-none-eabi"
33+
toolchain_md5_checksum="e91fd6348ba0f3e5ec35eeba1ad7e2b8"
3434
toolchain_archive="${toolchain_dir}.tar.xz"
3535
elif [[ "${OS}" == "Linux" ]]; then
36-
toolchain_url="https://armkeil.blob.core.windows.net/developer/Files/downloads/gnu/13.3.rel1/binrel/arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi.tar.xz"
37-
toolchain_dir="arm-gnu-toolchain-13.3.rel1-aarch64-arm-none-eabi"
38-
toolchain_md5_checksum="303102d97b877ebbeb36b3158994b218"
36+
toolchain_url="https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-aarch64-arm-none-eabi.tar.xz"
37+
toolchain_dir="arm-gnu-toolchain-15.2.rel1-aarch64-arm-none-eabi"
38+
toolchain_md5_checksum="458c5d9b362726c9ac20c96f1894ae13"
3939
toolchain_archive="${toolchain_dir}.tar.xz"
4040
fi
4141
else

third-party/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,13 @@ set(FLATCC_INSTALL
151151
CACHE BOOL ""
152152
)
153153
add_subdirectory(flatcc)
154+
if(CMAKE_C_COMPILER_ID STREQUAL "GNU"
155+
AND CMAKE_C_COMPILER_VERSION VERSION_GREATER_EQUAL 15
156+
)
157+
target_compile_options(
158+
flatccrt PRIVATE -Wno-error=unterminated-string-initialization
159+
)
160+
endif()
154161
# Unfortunately flatcc writes libs directly in to the source tree [1]. So to
155162
# ensure the target lib is created last, force flatcc_cli to build first.
156163
#

0 commit comments

Comments
 (0)