toolchain: upgrade to gcc 12

tsl0922 · Jun 30, 2023 · 6e2f8be · 6e2f8be
1 parent 1c4cd99
commit 6e2f8be
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/.github/workflows/toolchain.yml b/.github/workflows/toolchain.yml
@@ -20,14 +20,14 @@ jobs:
         run: |
           make toolchain/build
           cd toolchain-mipsel/toolchain-4.4.x
-          tar cJf ../mipsel-linux-uclibc-gcc10.tar.xz *
+          tar cJf ../mipsel-linux-uclibc-gcc12.tar.xz *
       - uses: actions/upload-artifact@v3
         with:
           name: toolchain
-          path: toolchain-mipsel/mipsel-linux-uclibc-gcc10.tar.xz
+          path: toolchain-mipsel/mipsel-linux-uclibc-gcc12.tar.xz
       - uses: svenstaro/[email protected]
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
-          file: toolchain-mipsel/mipsel-linux-uclibc-gcc10.tar.xz
+          file: toolchain-mipsel/mipsel-linux-uclibc-gcc12.tar.xz
           tag: toolchain
           overwrite: true
diff --git a/Makefile b/Makefile
@@ -2,7 +2,7 @@ TOPDIR:=${CURDIR}
 SOURCE_DIR:=$(TOPDIR)/trunk
 TOOLCHAIN_DIR:=$(TOPDIR)/toolchain-mipsel
 TOOLCHAIN_ROOT:=$(TOOLCHAIN_DIR)/toolchain-4.4.x
-TOOLCHAIN_URL:=https://github.com/tsl0922/padavan/releases/download/toolchain/mipsel-linux-uclibc-gcc10.tar.xz
+TOOLCHAIN_URL:=https://github.com/tsl0922/padavan/releases/download/toolchain/mipsel-linux-uclibc-gcc12.tar.xz
 TEMPLATE_DIR:=$(SOURCE_DIR)/configs/templates
 PRODUCTS:=$(shell ls $(TEMPLATE_DIR) | sed 's/.config//g')
 CONFIG:=$(SOURCE_DIR)/.config

diff --git a/README.md b/README.md
@@ -8,7 +8,7 @@ This project is based on original rt-n56u with latest mtk 4.4.198 kernel, which
 - Optimized Makefiles and build scripts, added a toplevel Makefile
 - Added ccache support, may save up to 50%+ build time
 - Upgraded the toolchain and libc:
-  - gcc 10.4.0
+  - gcc 12.3.0
   - uClibc-ng 1.0.43
  - Enabled kernel cgroups support
  - Fixed K2P led label names

diff --git a/toolchain-mipsel/samples/mipsel-linux-uclibc/crosstool.config b/toolchain-mipsel/samples/mipsel-linux-uclibc/crosstool.config
@@ -30,10 +30,9 @@ CT_LIBC_UCLIBC_CONFIG_FILE="${CT_TOP_DIR}/../trunk/configs/boards/uclibc-mipsel.
 CT_LIBC_UCLIBC_IPV6=y
 CT_LIBC_UCLIBC_WCHAR=y
 # CT_LIBC_UCLIBC_HAS_SSP is not set
-CT_GCC_V_10=y
+CT_GCC_V_12=y
 CT_CC_GCC_CORE_EXTRA_CONFIG_ARRAY="--with-gnu-ld"
 CT_CC_GCC_EXTRA_CONFIG_ARRAY="--with-gnu-ld"
 CT_CC_GCC_CONFIG_TLS=y
 # CT_CC_GCC_USE_GRAPHITE is not set
 CT_CC_LANG_CXX=y
-
diff --git a/trunk/linux-4.4.x/arch/mips/kernel/Makefile b/trunk/linux-4.4.x/arch/mips/kernel/Makefile
@@ -9,6 +9,8 @@ obj-y		+= cpu-probe.o branch.o elf.o entry.o genex.o idle.o irq.o \
 		   syscall.o time.o topology.o traps.o unaligned.o watch.o \
 		   vdso.o
 
+CFLAGS_traps.o += -Wno-array-bounds
+
 ifdef CONFIG_FUNCTION_TRACER
 CFLAGS_REMOVE_ftrace.o = -pg
 CFLAGS_REMOVE_early_printk.o = -pg