From a4ef1ae736cd58375affed966cf1399fe8df5774 Mon Sep 17 00:00:00 2001
From: Nick Brassel
Date: Mon, 19 May 2025 09:22:31 +1000
Subject: gcc15 AVR compilation fixes (#25238)

---
 platforms/avr/platform.mk | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'platforms')

diff --git a/platforms/avr/platform.mk b/platforms/avr/platform.mk
index a625f2e5d0..f0187457b3 100644
--- a/platforms/avr/platform.mk
+++ b/platforms/avr/platform.mk
@@ -12,9 +12,10 @@ HEX = $(OBJCOPY) -O $(FORMAT) -R .eeprom -R .fuse -R .lock -R .signature
 EEP = $(OBJCOPY) -j .eeprom --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0 --no-change-warnings -O $(FORMAT)
 BIN =
 
-ifeq ("$(shell echo "int main(){}" | $(CC) --param=min-pagesize=0 -x c - -o /dev/null 2>&1)", "")
-COMPILEFLAGS += --param=min-pagesize=0
-endif
+COMPILEFLAGS += $(call cc-option,--param=min-pagesize=0)
+
+# Fix ICE's: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=116389
+COMPILEFLAGS += $(call cc-option,-mlra)
 
 COMPILEFLAGS += -funsigned-char
 COMPILEFLAGS += -funsigned-bitfields
@@ -25,10 +26,12 @@ COMPILEFLAGS += -fshort-enums
 COMPILEFLAGS += -mcall-prologues
 COMPILEFLAGS += -fno-builtin-printf
 
-# Linker relaxation is only possible if
-# link time optimizations are not enabled.
+# On older compilers, linker relaxation is only possible if link time optimizations are not enabled.
 ifeq ($(strip $(LTO_ENABLE)), no)
 	COMPILEFLAGS += -mrelax
+else
+	# Newer compilers may support both, so quickly check before adding `-mrelax`.
+	COMPILEFLAGS += $(call cc-option,-mrelax,,-flto=auto)
 endif
 
 ASFLAGS += $(AVR_ASFLAGS)
-- 
cgit v1.2.3