Skip to content

Commit 766b052

Browse files
authored
Merge pull request #10386 from dhalbert/gcc14
switch to gcc 14.2Rel1
2 parents 0028818 + 84a73bf commit 766b052

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

.devcontainer/cortex-m-toolchain.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ echo -e "[cortex-m-toolchain.sh] downloading and installing gcc-arm-non-eabi too
1414
cd /workspaces
1515

1616
wget -qO gcc-arm-none-eabi.tar.xz \
17-
https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-x86_64-arm-none-eabi.tar.xz
17+
https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
1818

1919
tar -xJf gcc-arm-none-eabi.tar.xz
20-
ln -s arm-gnu-toolchain-13.2.Rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
20+
ln -s arm-gnu-toolchain-14.2.Rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
2121
rm -f gcc-arm-none-eabi.tar.xz
2222

2323
echo -e "[cortex-m-toolchain.sh] update PATH in environment"

.github/actions/deps/external/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ runs:
2727
uses: carlosperate/arm-none-eabi-gcc-action@v1
2828
with:
2929
# When changing this update what Windows grabs too!
30-
release: '13.2.Rel1'
30+
release: '14.2.Rel1'
3131

3232
# espressif
3333
- name: Get espressif toolchain

.github/actions/deps/ports/broadcom/action.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@ runs:
55
steps:
66
- name: Get broadcom toolchain
77
run: |
8-
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
9-
sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-13.3.rel1-x86_64-aarch64-none-elf.tar.xz
8+
wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
9+
sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
1010
sudo apt-get update
1111
sudo apt-get install -y mtools
1212
shell: bash

.github/workflows/build.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,9 @@ jobs:
261261
python3 -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
262262
- name: Install dependencies
263263
run: |
264-
wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/13.2.rel1/binrel/arm-gnu-toolchain-13.2.rel1-mingw-w64-i686-arm-none-eabi.zip
265-
unzip -q -d /tmp gcc-arm.zip
266-
tar -C /tmp/arm-gnu-toolchain* -cf - . | tar -C /usr/local -xf -
264+
wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-mingw-w64-i686-arm-none-eabi.zip
265+
unzip -q -d /tmp/arm-gnu-toolchain gcc-arm.zip
266+
tar -C /tmp/arm-gnu-toolchain -cf - . | tar -C /usr/local -xf -
267267
# We could use a venv instead, but that requires entering the venv on each run step
268268
# that runs in its own shell. There are some actions that help with that, but not for msys2
269269
# that I can find. (dhalbert)

ports/broadcom/mpconfigport.mk

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ USB_HIGHSPEED = 1
2727
CIRCUITPY_BUILD_EXTENSIONS ?= disk.img.zip,kernel8.img
2828

2929
ifeq ($(CHIP_VARIANT), "bcm2711")
30-
CIRCUITPY_MIN_GCC_VERSION ?= 10
30+
CIRCUITPY_MIN_GCC_VERSION ?= 14
3131
else ifeq ($(CHIP_VARIANT), "bcm2837")
32-
CIRCUITPY_MIN_GCC_VERSION ?= 10
32+
CIRCUITPY_MIN_GCC_VERSION ?= 14
3333
endif

py/circuitpy_mpconfig.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -639,7 +639,7 @@ void background_callback_run_all(void);
639639
#define MICROPY_PY_BUILTINS_COMPILE (1)
640640

641641
#ifndef CIRCUITPY_MIN_GCC_VERSION
642-
#define CIRCUITPY_MIN_GCC_VERSION 13
642+
#define CIRCUITPY_MIN_GCC_VERSION 14
643643
#endif
644644

645645
#ifndef CIRCUITPY_SAVES_PARTITION_SIZE

py/circuitpy_mpconfig.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -719,7 +719,7 @@ CIRCUITPY_SWO_TRACE ?= 0
719719
CFLAGS += -DCIRCUITPY_SWO_TRACE=$(CIRCUITPY_SWO_TRACE)
720720

721721
# Check for a minimum GCC version during build (set to 0 to disable)
722-
CIRCUITPY_MIN_GCC_VERSION ?= 13
722+
CIRCUITPY_MIN_GCC_VERSION ?= 14
723723
CFLAGS += -DCIRCUITPY_MIN_GCC_VERSION=$(CIRCUITPY_MIN_GCC_VERSION)
724724

725725
# Define an equivalent for MICROPY_LONGINT_IMPL, to pass to $(MPY-TOOL) in py/mkrules.mk

0 commit comments

Comments
 (0)