From 3770a0d3bfbfa9cd17ed0e87a5369287299e1e72 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sat, 3 Aug 2024 12:37:03 +0200 Subject: gcc: update to 14.2.0 --- target/config/Config.in.compiler | 2 +- toolchain/gcc/Makefile.inc | 4 ++-- toolchain/gcc/patches/14.1.0/csky.patch | 12 ------------ toolchain/gcc/patches/14.1.0/nios2-softfp.patch | 14 -------------- toolchain/gcc/patches/14.2.0/csky.patch | 12 ++++++++++++ toolchain/gcc/patches/14.2.0/nios2-softfp.patch | 14 ++++++++++++++ 6 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 toolchain/gcc/patches/14.1.0/csky.patch delete mode 100644 toolchain/gcc/patches/14.1.0/nios2-softfp.patch create mode 100644 toolchain/gcc/patches/14.2.0/csky.patch create mode 100644 toolchain/gcc/patches/14.2.0/nios2-softfp.patch diff --git a/target/config/Config.in.compiler b/target/config/Config.in.compiler index 41091c763..d744915dc 100644 --- a/target/config/Config.in.compiler +++ b/target/config/Config.in.compiler @@ -32,7 +32,7 @@ config ADK_TOOLCHAIN_GCC_GIT depends on !ADK_TARGET_ARCH_NDS32 config ADK_TOOLCHAIN_GCC_14 - bool "14.1.0" + bool "14.2.0" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_CRIS depends on !ADK_TARGET_ARCH_METAG diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc index 8f96784e1..3218a44c5 100644 --- a/toolchain/gcc/Makefile.inc +++ b/toolchain/gcc/Makefile.inc @@ -3,8 +3,8 @@ PKG_NAME:= gcc ifeq ($(ADK_TOOLCHAIN_GCC_14),y) -PKG_VERSION:= 14.1.0 -PKG_HASH:= a0be066c02775002a0fa65ad3c65fb56a8bfd923d072a26ed148c0439ecdb68f +PKG_VERSION:= 14.2.0 +PKG_HASH:= 7d376d445f93126dc545e2c0086d0f647c3094aae081cdb78f42ce2bc25e7293 PKG_SITES:= ${MASTER_SITE_GNU:=gcc/gcc-${PKG_VERSION}/} PKG_RELEASE:= 1 DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz diff --git a/toolchain/gcc/patches/14.1.0/csky.patch b/toolchain/gcc/patches/14.1.0/csky.patch deleted file mode 100644 index ee352951b..000000000 --- a/toolchain/gcc/patches/14.1.0/csky.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur gcc-11.2.0.orig/libgcc/config/csky/linux-atomic.c gcc-11.2.0/libgcc/config/csky/linux-atomic.c ---- gcc-11.2.0.orig/libgcc/config/csky/linux-atomic.c 2021-07-28 08:55:08.760307899 +0200 -+++ gcc-11.2.0/libgcc/config/csky/linux-atomic.c 2021-12-14 14:19:23.685729233 +0100 -@@ -24,7 +24,7 @@ - . */ - - /* Kernel helper for compare-and-exchange. */ --inline int -+int - __kernel_cmpxchg (int oldval, int newval, volatile int *ptr) - { - register int _a0 asm ("a0") = oldval; diff --git a/toolchain/gcc/patches/14.1.0/nios2-softfp.patch b/toolchain/gcc/patches/14.1.0/nios2-softfp.patch deleted file mode 100644 index c677c6c2f..000000000 --- a/toolchain/gcc/patches/14.1.0/nios2-softfp.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur gcc-6.2.0.orig/libgcc/config.host gcc-6.2.0/libgcc/config.host ---- gcc-6.2.0.orig/libgcc/config.host 2016-05-17 08:15:52.000000000 +0200 -+++ gcc-6.2.0/libgcc/config.host 2016-10-15 14:42:53.971919904 +0200 -@@ -962,6 +962,10 @@ - ;; - esac - ;; -+nios2-*-linux-uclibc*) -+ tmake_file="$tmake_file nios2/t-nios2 nios2/t-linux t-libgcc-pic t-slibgcc-libgcc t-softfp-sfdf t-softfp" -+ md_unwind_header=nios2/linux-unwind.h -+ ;; - nios2-*-linux*) - tmake_file="$tmake_file nios2/t-nios2 nios2/t-linux t-libgcc-pic t-slibgcc-libgcc" - md_unwind_header=nios2/linux-unwind.h diff --git a/toolchain/gcc/patches/14.2.0/csky.patch b/toolchain/gcc/patches/14.2.0/csky.patch new file mode 100644 index 000000000..ee352951b --- /dev/null +++ b/toolchain/gcc/patches/14.2.0/csky.patch @@ -0,0 +1,12 @@ +diff -Nur gcc-11.2.0.orig/libgcc/config/csky/linux-atomic.c gcc-11.2.0/libgcc/config/csky/linux-atomic.c +--- gcc-11.2.0.orig/libgcc/config/csky/linux-atomic.c 2021-07-28 08:55:08.760307899 +0200 ++++ gcc-11.2.0/libgcc/config/csky/linux-atomic.c 2021-12-14 14:19:23.685729233 +0100 +@@ -24,7 +24,7 @@ + . */ + + /* Kernel helper for compare-and-exchange. */ +-inline int ++int + __kernel_cmpxchg (int oldval, int newval, volatile int *ptr) + { + register int _a0 asm ("a0") = oldval; diff --git a/toolchain/gcc/patches/14.2.0/nios2-softfp.patch b/toolchain/gcc/patches/14.2.0/nios2-softfp.patch new file mode 100644 index 000000000..c677c6c2f --- /dev/null +++ b/toolchain/gcc/patches/14.2.0/nios2-softfp.patch @@ -0,0 +1,14 @@ +diff -Nur gcc-6.2.0.orig/libgcc/config.host gcc-6.2.0/libgcc/config.host +--- gcc-6.2.0.orig/libgcc/config.host 2016-05-17 08:15:52.000000000 +0200 ++++ gcc-6.2.0/libgcc/config.host 2016-10-15 14:42:53.971919904 +0200 +@@ -962,6 +962,10 @@ + ;; + esac + ;; ++nios2-*-linux-uclibc*) ++ tmake_file="$tmake_file nios2/t-nios2 nios2/t-linux t-libgcc-pic t-slibgcc-libgcc t-softfp-sfdf t-softfp" ++ md_unwind_header=nios2/linux-unwind.h ++ ;; + nios2-*-linux*) + tmake_file="$tmake_file nios2/t-nios2 nios2/t-linux t-libgcc-pic t-slibgcc-libgcc" + md_unwind_header=nios2/linux-unwind.h -- cgit v1.2.3