Merge pull request #10825 from dhalbert/gcc-15.2Rel1

tannewt · web-flow · commit 714d8c384534 · 2026-02-18T09:44:03.000-08:00
update to arm gcc 15.2Rel1
diff --git a/.devcontainer/cortex-m-toolchain.sh b/.devcontainer/cortex-m-toolchain.sh
@@ -14,10 +14,10 @@ echo -e "[cortex-m-toolchain.sh] downloading and installing gcc-arm-non-eabi too
 cd /workspaces
 
 wget -qO gcc-arm-none-eabi.tar.xz \
-  https://developer.arm.com/-/media/Files/downloads/gnu/14.2.rel1/binrel/arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi.tar.xz
+  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
 
 tar -xJf gcc-arm-none-eabi.tar.xz
-ln -s arm-gnu-toolchain-14.2.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
+ln -s arm-gnu-toolchain-15.2.rel1-x86_64-arm-none-eabi gcc-arm-none-eabi
 rm -f gcc-arm-none-eabi.tar.xz
 
 echo -e "[cortex-m-toolchain.sh] update PATH in environment"
diff --git a/.github/actions/deps/external/action.yml b/.github/actions/deps/external/action.yml
@@ -27,7 +27,7 @@ runs:
       uses: carlosperate/arm-none-eabi-gcc-action@v1
       with:
         # When changing this update what Windows grabs too!
-        release: '14.2.Rel1'
+        release: '15.2.Rel1'
 
     # espressif
     - name: Get espressif toolchain
diff --git a/.github/actions/deps/ports/broadcom/action.yml b/.github/actions/deps/ports/broadcom/action.yml
@@ -5,8 +5,8 @@ runs:
   steps:
     - name: Get broadcom toolchain
       run: |
-        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
-        sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-14.2.rel1-x86_64-aarch64-none-elf.tar.xz
+        wget --no-verbose https://adafruit-circuit-python.s3.amazonaws.com/arm-gnu-toolchain-15.2.rel1-x86_64-aarch64-none-elf.tar.xz
+        sudo tar -C /usr --strip-components=1 -xaf arm-gnu-toolchain-15.2.rel1-x86_64-aarch64-none-elf.tar.xz
         sudo apt-get update
         sudo apt-get install -y mtools
       shell: bash
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -246,7 +246,7 @@ jobs:
         python3 -c "import sys, locale; print(sys.getdefaultencoding(), locale.getpreferredencoding(False))"
     - name: Install dependencies
       run: |
-        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
+        wget --no-verbose -O gcc-arm.zip https://developer.arm.com/-/media/Files/downloads/gnu/15.2.rel1/binrel/arm-gnu-toolchain-15.2.rel1-mingw-w64-i686-arm-none-eabi.zip
         unzip -q -d /tmp/arm-gnu-toolchain gcc-arm.zip
         tar -C /tmp/arm-gnu-toolchain -cf - . | tar -C /usr/local -xf -
         # We could use a venv instead, but that requires entering the venv on each run step
diff --git a/ports/cxd56/Makefile b/ports/cxd56/Makefile
@@ -74,7 +74,7 @@ CFLAGS += \
 	-fdata-sections \
 	-Wall \
 
-OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions
+OPTIMIZATION_FLAGS ?= -O2
 
 # option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
 CFLAGS += $(OPTIMIZATION_FLAGS)
diff --git a/ports/cxd56/common-hal/microcontroller/__init__.c b/ports/cxd56/common-hal/microcontroller/__init__.c
@@ -61,6 +61,8 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {
 void common_hal_mcu_reset(void) {
     filesystem_flush();
     boardctl(BOARDIOC_RESET, 0);
+    // boardctl is noreturn in this case.
+    __builtin_unreachable();
 }
 
 static const mp_rom_map_elem_t mcu_pin_globals_table[] = {
diff --git a/ports/litex/Makefile b/ports/litex/Makefile
@@ -32,7 +32,7 @@ ifeq ($(DEBUG), 1)
   OPTIMIZATION_FLAGS ?= -Og
 else
   CFLAGS += -DNDEBUG -ggdb3
-  OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions
+  OPTIMIZATION_FLAGS ?= -O2
 endif
 
 # option to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
diff --git a/ports/nordic/Makefile b/ports/nordic/Makefile
@@ -36,8 +36,8 @@ ifeq ($(DEBUG), 1)
   CFLAGS += -ggdb3
   OPTIMIZATION_FLAGS = -Og
 else
-  OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions
-  CFLAGS += -DNDEBUG -ggdb3
+  OPTIMIZATION_FLAGS ?= -O2
+  CFLAGS += -DNDEBUG
 endif
 
 ifeq ($(NRF_DEBUG_PRINT), 1)
diff --git a/ports/silabs/Makefile b/ports/silabs/Makefile
@@ -71,7 +71,7 @@ ifeq ($(DEBUG), 1)
 	CFLAGS += -fno-inline -fno-ipa-sra -Og
 else
 	CFLAGS += -DNDEBUG
-	OPTIMIZATION_FLAGS ?= -Os -fno-inline-functions
+	OPTIMIZATION_FLAGS ?= -Os
 	CFLAGS += -g
 endif
 
diff --git a/ports/stm/Makefile b/ports/stm/Makefile
@@ -38,8 +38,7 @@ ifeq ($(DEBUG), 1)
 	CFLAGS += -fno-inline -fno-ipa-sra
 else
 	CFLAGS += -DNDEBUG
-	OPTIMIZATION_FLAGS ?= -O2 -fno-inline-functions
-	CFLAGS += -ggdb3
+	OPTIMIZATION_FLAGS ?= -O2
 endif
 
 # to override compiler optimization level, set in boards/$(BOARD)/mpconfigboard.mk
diff --git a/ports/stm/boards/stm32f411ce_blackpill_with_flash/mpconfigboard.mk b/ports/stm/boards/stm32f411ce_blackpill_with_flash/mpconfigboard.mk
@@ -9,6 +9,7 @@ EXTERNAL_FLASH_DEVICES = GD25Q16C,W25Q16JVxQ,W25Q64FV,W25Q32JVxQ,W25Q64JVxQ
 LONGINT_IMPL = MPZ
 
 INTERNAL_FLASH_FILESYSTEM = 0
+OPTIMIZATION_FLAGS = -Os
 
 MCU_SERIES = F4
 MCU_VARIANT = STM32F411xE
diff --git a/ports/stm/mpconfigport.mk b/ports/stm/mpconfigport.mk
@@ -10,6 +10,10 @@ ifeq ($(MCU_VARIANT),$(filter $(MCU_VARIANT),STM32F405xx STM32F407xx))
         USB_NUM_ENDPOINT_PAIRS = 4
 endif
 
+ifeq ($(INTERNAL_FLASH_FILESYSTEM),1)
+  OPTIMIZATION_FLAGS ?= -Os
+endif
+
 ifeq ($(MCU_VARIANT),STM32F407xx)
         UF2_FAMILY_ID ?= 0x6d0922fa
 endif

Original file line number	Diff line number	Diff line change
`@@ -61,6 +61,8 @@ void common_hal_mcu_on_next_reset(mcu_runmode_t runmode) {`
`61`	`61`	`void common_hal_mcu_reset(void) {`
`62`	`62`	`filesystem_flush();`
`63`	`63`	`boardctl(BOARDIOC_RESET, 0);`
	`64`	`+ // boardctl is noreturn in this case.`
	`65`	`+ __builtin_unreachable();`
`64`	`66`	`}`
`65`	`67`
`66`	`68`	`static const mp_rom_map_elem_t mcu_pin_globals_table[] = {`