From 9df09872596ae030bd294297e703abc7083375d9 Mon Sep 17 00:00:00 2001
From: Dave Murphy <davem@devkitpro.org>
Date: Sat, 18 Mar 2023 22:39:09 +0000
Subject: [PATCH] devkitPPC: update binutils to 2.40

---
 dkppc/patches/binutils-2.37.patch | 28 ----------------------------
 dkppc/patches/binutils-2.40.patch | 26 ++++++++++++++++++++++++++
 select_toolchain.sh               |  2 +-
 3 files changed, 27 insertions(+), 29 deletions(-)
 delete mode 100644 dkppc/patches/binutils-2.37.patch
 create mode 100644 dkppc/patches/binutils-2.40.patch

diff --git a/dkppc/patches/binutils-2.37.patch b/dkppc/patches/binutils-2.37.patch
deleted file mode 100644
index add8404..0000000
--- a/dkppc/patches/binutils-2.37.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -NBaur binutils-2.37/libiberty/rust-demangle.c binutils-2.37-new/libiberty/rust-demangle.c
---- binutils-2.37/libiberty/rust-demangle.c	2021-07-15 15:19:46.000000000 +0100
-+++ binutils-2.37-new/libiberty/rust-demangle.c	2022-01-01 22:02:21.860422023 +0000
-@@ -75,10 +75,10 @@
-   int version;
- 
-   /* Recursion depth.  */
--  uint recursion;
-+  unsigned recursion;
-   /* Maximum number of times demangle_path may be called recursively.  */
- #define RUST_MAX_RECURSION_COUNT  1024
--#define RUST_NO_RECURSION_LIMIT   ((uint) -1)
-+#define RUST_NO_RECURSION_LIMIT   ((unsigned) -1)
- 
-   uint64_t bound_lifetime_depth;
- };
-diff -NBaur binutils-2.37/opcodes/ppc-opc.c binutils-2.37-new/opcodes/ppc-opc.c
---- binutils-2.37/opcodes/ppc-opc.c	2021-07-08 12:37:21.000000000 +0100
-+++ binutils-2.37-new/opcodes/ppc-opc.c	2022-01-01 22:02:04.409141184 +0000
-@@ -4302,7 +4302,7 @@
- #define MFDEC2	(PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
- 		 | PPC_OPCODE_TITAN)
- #define BOOKE	PPC_OPCODE_BOOKE
--#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
-+#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
- #define PPCE300 PPC_OPCODE_E300
- #define PPCSPE	PPC_OPCODE_SPE
- #define PPCSPE2 PPC_OPCODE_SPE2
diff --git a/dkppc/patches/binutils-2.40.patch b/dkppc/patches/binutils-2.40.patch
new file mode 100644
index 0000000..f25e5d7
--- /dev/null
+++ b/dkppc/patches/binutils-2.40.patch
@@ -0,0 +1,26 @@
+diff --git a/ld/emulparams/elf32ppccommon.sh b/ld/emulparams/elf32ppccommon.sh
+index da892988f5d..6b8efb9bbdb 100644
+--- a/ld/emulparams/elf32ppccommon.sh
++++ b/ld/emulparams/elf32ppccommon.sh
+@@ -23,7 +23,7 @@ else
+   unset SBSS_START_SYMBOLS
+   unset SBSS_END_SYMBOLS
+ fi
+-OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};"
++OTHER_END_SYMBOLS="${CREATE_SHLIB+PROVIDE (}__end = .${CREATE_SHLIB+)};${CREATE_SHLIB+PROVIDE (}__end__ = .${CREATE_SHLIB+)};"
+ OTHER_RELRO_SECTIONS="
+   .fixup        ${RELOCATING-0} : { *(.fixup) }
+   .got1         ${RELOCATING-0} : { *(.got1) }
+diff --git a/opcodes/ppc-opc.c b/opcodes/ppc-opc.c
+index 37f1aeb780c..f8de8aacc44 100644
+--- a/opcodes/ppc-opc.c
++++ b/opcodes/ppc-opc.c
+@@ -4988,7 +4988,7 @@ const unsigned int num_powerpc_operands = ARRAY_SIZE (powerpc_operands);
+ #define MFDEC2	(PPC_OPCODE_PPC | PPC_OPCODE_601 | PPC_OPCODE_BOOKE \
+ 		 | PPC_OPCODE_TITAN)
+ #define BOOKE	PPC_OPCODE_BOOKE
+-#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_PPCPS | PPC_OPCODE_EFS
++#define NO371	PPC_OPCODE_BOOKE | PPC_OPCODE_EFS
+ #define PPCE300 PPC_OPCODE_E300
+ #define PPCSPE	PPC_OPCODE_SPE
+ #define PPCSPE2 PPC_OPCODE_SPE2
diff --git a/select_toolchain.sh b/select_toolchain.sh
index 04c3044..dff40fa 100755
--- a/select_toolchain.sh
+++ b/select_toolchain.sh
@@ -40,7 +40,7 @@ case "$VERSION" in
   ;;
   "2" )
     GCC_VER=12.2.0
-    BINUTILS_VER=2.37
+    BINUTILS_VER=2.40
     MN_BINUTILS_VER=2.24
     NEWLIB_VER=4.2.0.20211231
     basedir='dkppc'