build: check compiler version and enforce >= 13

Author: ppannuto

Configuration.mk

@@ -18,6 +18,9 @@ CONFIGURATION_MAKEFILE = 1
 MAKEFLAGS += -r
 MAKEFLAGS += -R
 
+# Enforce a minimum complier version
+MINIMUM_GCC_MAJOR := 13
+
 # Toolchain programs.
 AR := -ar
 AS := -as
@@ -260,6 +263,12 @@ ifneq ($(findstring rv32i,$(TOCK_ARCH_FAMILIES)),)
   CC_rv32_version_major := $(shell echo $(CC_rv32_version) | cut -f1 -d.)
 endif
 
+# Validate the the toolchain is new enough
+ifneq (1,$(shell [ $(CC_rv32_version_major) -ge $(MINIMUM_GCC_MAJOR) ] && echo "1"))
+  $(info $(TOOLCHAIN_rv32)$(CC_rv32) -dumpfullversion: $(CC_rv32_version))
+  $(error Your compiler is too old. Need gcc version >= $(MINIMUM_GCC_MAJOR))
+endif
+
 # Match compiler version to support libtock-newlib versions.
 ifeq ($(CC_rv32_version_major),10)
   NEWLIB_VERSION_rv32 := 4.2.0.20211231
@@ -406,6 +415,12 @@ ifneq ($(findstring cortex-m,$(TOCK_ARCH_FAMILIES)),)
   CC_cortex-m_version_major := $(shell echo $(CC_cortex-m_version) | cut -f1 -d.)
 endif
 
+# Validate the the toolchain is new enough
+ifneq (1,$(shell [ $(CC_cortex-m_version_major) -ge $(MINIMUM_GCC_MAJOR) ] && echo "1"))
+  $(info $(TOOLCHAIN_cortex-m)$(CC_cortex-m) -dumpfullversion: $(CC_cortex-m_version))
+  $(error Your compiler is too old. Need gcc version >= $(MINIMUM_GCC_MAJOR))
+endif
+
 # Match compiler version to support libtock-newlib versions.
 ifeq ($(CC_cortex-m_version_major),10)
   NEWLIB_VERSION_cortex-m := 4.2.0.20211231

Helpers.mk

@@ -40,26 +40,6 @@ ifdef TOCK_USERLAND_BASE_DIR
     endif
 endif
 
-# # Validate the the toolchain is new enough (known not to work for gcc <= 5.1)
-# CC_VERSION_MAJOR := $(shell $(CC) -dumpversion | cut -d '.' -f1)
-# ifeq (1,$(shell expr $(CC_VERSION_MAJOR) \>= 6))
-#   # Opportunistically turn on gcc 6.0+ warnings since we're already version checking:
-#   override CPPFLAGS += -Wduplicated-cond #  if (p->q != NULL) { ... } else if (p->q != NULL) { ... }
-#   override CPPFLAGS += -Wnull-dereference # deref of NULL (thought default if -fdelete-null-pointer-checks, in -Os, but no?)
-# else
-#   ifneq (5,$(CC_VERSION_MAJOR))
-#     $(info CC=$(CC))
-#     $(info $$(CC) -dumpversion: $(shell $(CC) -dumpversion))
-#     $(error Your compiler is too old. Need gcc version > 5.1)
-#   endif
-#     CC_VERSION_MINOR := $(shell $(CC) -dumpversion | cut -d '.' -f2)
-#   ifneq (1,$(shell expr $(CC_VERSION_MINOR) \> 1))
-#     $(info CC=$(CC))
-#     $(info $$(CC) -dumpversion: $(shell $(CC) -dumpversion))
-#     $(error Your compiler is too old. Need gcc version > 5.1)
-#   endif
-# endif
-
 
 # Format check rule
 .PHONY: _format_check_unstaged