From 8ccc01e0c735bb85d789b1060b6b305cd0ae8783 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Tue, 19 Oct 2021 07:49:55 +1100
Subject: [PATCH] Fix builds for ChibiOS + Cortex-M0[+]

---
 tmk_core/chibios.mk | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tmk_core/chibios.mk b/tmk_core/chibios.mk
index cae840fa4ff5..ad0ffa762d92 100644
--- a/tmk_core/chibios.mk
+++ b/tmk_core/chibios.mk
@@ -330,7 +330,7 @@ ifeq ($(strip $(MCU)), risc-v)
             endif
         endif
     endif
-    
+
     # Default to compiling with picolibc for RISC-V targets if available,
     # which is available by default on current (bullseye) debian based systems.
     ifeq ($(shell $(TOOLCHAIN)gcc --specs=picolibc.specs -E - 2>/dev/null >/dev/null </dev/null ; echo $$?),0)
@@ -338,11 +338,11 @@ ifeq ($(strip $(MCU)), risc-v)
         # Note that we still link with our own linker script
         # by providing it via the -T flag above.
         TOOLCHAIN_CFLAGS = --specs=picolibc.specs
-        
+
         # Tell QMK that we are compiling with picolibc.
         OPT_DEFS += -DUSE_PICOLIBC
     endif
-    
+
     # MCU architecture flags
     MCUFLAGS = -march=$(MCU_ARCH) \
                -mabi=$(MCU_ABI) \
@@ -394,6 +394,9 @@ LDFLAGS  += $(SHARED_LDFLAGS) $(TOOLCHAIN_LDFLAGS) $(MCUFLAGS)
 # Tell QMK that we are hosting it on ChibiOS.
 OPT_DEFS += -DPROTOCOL_CHIBIOS
 
+# Workaround to stop ChibiOS from complaining about new GCC -- it's been fixed for 7/8/9 already
+OPT_DEFS += -DPORT_IGNORE_GCC_VERSION_CHECK=1
+
 # Speed up recompilations by opt-in usage of ccache
 USE_CCACHE ?= no
 ifneq ($(USE_CCACHE),no)