From 7d8ba84d57c16ae98211e95e45d1b0702df7a29e Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 12 Jul 2025 02:55:02 +0200
Subject: gcc: update to 13.3.0

---
 toolchain/gcc/Makefile.inc                      |  4 ++--
 toolchain/gcc/patches/13.3.0/csky.patch         | 12 ------------
 toolchain/gcc/patches/13.3.0/nios2-softfp.patch | 14 --------------
 toolchain/gcc/patches/13.4.0/csky.patch         | 12 ++++++++++++
 toolchain/gcc/patches/13.4.0/nios2-softfp.patch | 14 ++++++++++++++
 5 files changed, 28 insertions(+), 28 deletions(-)
 delete mode 100644 toolchain/gcc/patches/13.3.0/csky.patch
 delete mode 100644 toolchain/gcc/patches/13.3.0/nios2-softfp.patch
 create mode 100644 toolchain/gcc/patches/13.4.0/csky.patch
 create mode 100644 toolchain/gcc/patches/13.4.0/nios2-softfp.patch

(limited to 'toolchain/gcc')

diff --git a/toolchain/gcc/Makefile.inc b/toolchain/gcc/Makefile.inc
index dba6b9a6e..588dfa322 100644
--- a/toolchain/gcc/Makefile.inc
+++ b/toolchain/gcc/Makefile.inc
@@ -19,8 +19,8 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 LIBSTDCXXVER:=		30
 endif
 ifeq ($(ADK_TOOLCHAIN_GCC_13),y)
-PKG_VERSION:=		13.3.0
-PKG_HASH:=		3a2b10cab86e32358fdac871546d57e2700e9bdb5875ef33fff5b601265b9e32
+PKG_VERSION:=		13.4.0
+PKG_HASH:=		bf0baf3e570c9c74c17c8201f0196c6924b4bd98c90e69d6b2ac0cd823f33bbc
 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/13.3.0/csky.patch b/toolchain/gcc/patches/13.3.0/csky.patch
deleted file mode 100644
index ee352951b..000000000
--- a/toolchain/gcc/patches/13.3.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 @@
-    <http://www.gnu.org/licenses/>.	 */
- 
- /* 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/13.3.0/nios2-softfp.patch b/toolchain/gcc/patches/13.3.0/nios2-softfp.patch
deleted file mode 100644
index c677c6c2f..000000000
--- a/toolchain/gcc/patches/13.3.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/13.4.0/csky.patch b/toolchain/gcc/patches/13.4.0/csky.patch
new file mode 100644
index 000000000..ee352951b
--- /dev/null
+++ b/toolchain/gcc/patches/13.4.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 @@
+    <http://www.gnu.org/licenses/>.	 */
+ 
+ /* 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/13.4.0/nios2-softfp.patch b/toolchain/gcc/patches/13.4.0/nios2-softfp.patch
new file mode 100644
index 000000000..c677c6c2f
--- /dev/null
+++ b/toolchain/gcc/patches/13.4.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