gentoo auto-resync : 19:11:2024 - 03:03:00

3 files changed, 96 insertions, 1 deletions

diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index 5d04f46b9697..41ebd6fa346f 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -1,7 +1,8 @@
+AUX binutils-2.42-c23.patch 2908 BLAKE2B 3ebceb680ebef59f76e8ec182397cb7854585ebccc3d835c15d282824154b57ac9edc1360b1aeba7ed93d0be69885f91bc58bff41028566c367c413549686226 SHA512 e5280443543cc0fe88ddc38ef811d2213fa6d2f514791a5e9ffb83605bf44e68ca0934e873456e9f3d37c799a752beb1053cf1989c65a60dee18402d3241a539
 AUX gcc-12.2.0-drop-cflags-sed.patch 1077 BLAKE2B 4e0ff834cbfd4597c67d9adf2e287f2e40b746a6a6b31c52b95ab4b20292aad1931a1f64ffabd2bef611af85b643718e5a4a280d1e3b54e0a9f73b086d0dc39e SHA512 35647183fdf82bc179d94504d22a5e00a955121e888b5419a0033b7723a7e385c196096c64bf9ed59ad2c72188cb4792049ce423b226bfeb40ed379c355b91b8
 AUX gcc-14.1.0-no-omit-fp-ice.patch 595 BLAKE2B 543c4c4288f305f68eeba1df0d8e11b1539fbd063f0f9feac8f1731de50950f6b454ed90aecfe2efa854b1de3dda994ce1c31bdd443dd6f2d09f033775fe57a7 SHA512 30e48a0bf4fe5c40f2296307f2f16a80a42153fe2fc9a11516cab468cf3d9bccae7b66b8081837cc6f4b119fb3aeff36bc955ea6d24e2fe4f8e70180ce1a088a
 DIST binutils-2.42.tar.xz 27567160 BLAKE2B e67a5c028fba70e70088fd11b38ec8c9c4ed5a019badefda25abeb6275997b16f0891e7ff3424c4b82bbfae92e8992669826920dd53df61cd48469d8f7cd5bd1 SHA512 155f3ba14cd220102f4f29a4f1e5cfee3c48aa03b74603460d05afb73c70d6657a9d87eee6eb88bf13203fe6f31177a5c9addc04384e956e7da8069c8ecd20a6
 DIST gcc-14.1.0.tar.xz 92265736 BLAKE2B 7efd6574b8bca081de6e31480ec0565c6d7fb773383e8e1fdcc17e35bba2bf44b3f4f995cdbcccd001689926e96a6563ef3d099902fe3b37ab09dcf553ab0596 SHA512 e9e224f2b26646fcf038d28dfa08b94c623bc57941f99894a321d01c600f7c68aff6b8837fd25e73e540de1f8de5606e98694a62cdcdfb525ce768b3ef6879ea
 DIST mingw-w64-v12.0.0.tar.bz2 10474283 BLAKE2B 6500045f7d77f7de01dea0f4e03f3e4ddf6154586c5e3ee9718ee2c7ef1cc83ce3cbd644b6f1dc293ae6e0bfb55a6b68d439622bd1cfdefefc4cc547317f1943 SHA512 949b2bfab8763ab10ec4e9fdfdaf5361517a4ab787fb98ab419b38d02694061c2e821ebbf6e2e4b39d92bdf17419d116daa8e63afd9e01d11592f39df4da69d7
-EBUILD mingw64-toolchain-12.0.0.ebuild 11832 BLAKE2B 9cfde2c04e42c506c07a13d53b331641fe10c648e0e9465bd56832e71cb1a8fa55ecd6bc60df3c02f117e9e3a5e991169e7885b740576a77ff6d7796257b5c03 SHA512 87e441a532babb56a4bffa69183b3914aa601eb12e5cd76c69999ca0b117c9a22430d030a146b0f39b16be47d8bea6f9f6bfe8bdc9eef36220f39ff9362bd09a
+EBUILD mingw64-toolchain-12.0.0.ebuild 11871 BLAKE2B 3ef78c61d19c6a3f26e65d77fa95a6d42240115755df91de4c69d89b781e9e243597976edf3894e0590d19a2a668920f8e449fa13e7c8b43282c9a692daaae9a SHA512 22992d5e33e48d1b4c89683ff947342fffc553a17fec5d75d508ce3c0dd7c4fdf4c647abfc082517f17b79620d121661d9bec204c587c7fe761a6a956f2c98a4
 MISC metadata.xml 639 BLAKE2B 40e8fb879c8f26b7ba49bf453f242fbfd2a7950a0ec07f41945172a97ae77bdcf3ddfda741c6cf9f436efc42e9f5e72ccef67b408f62ea41335383eab76761f9 SHA512 280133ff26c17f4195635d3ab124a60d73bec1a2d841c91d89821dab18058381d30c4661f621c586ba4af31955cd902f1ef042301e04ff056ce20d0c45b7c4eb
diff --git a/dev-util/mingw64-toolchain/files/binutils-2.42-c23.patch b/dev-util/mingw64-toolchain/files/binutils-2.42-c23.patch
new file mode 100644
index 000000000000..f7e18615d6e0
--- /dev/null
+++ b/dev-util/mingw64-toolchain/files/binutils-2.42-c23.patch
@@ -0,0 +1,93 @@
+Needed with gcc15 due to newly defaulting to c23 (fixed in >=binutils-2.44).
+
+https://bugs.gentoo.org/943715
+https://sourceware.org/PR32372
+https://inbox.sourceware.org/binutils/cover.1731741209.git.sam@gentoo.org/
+(technically the full set of patches is not needed here, but doesn't hurt)
+--- a/binutils/bfd/elf32-ppc.c
++++ b/binutils/bfd/elf32-ppc.c
+@@ -4354,3 +4354,3 @@
+ 		      if (!bfd_elf_link_record_dynamic_symbol (info, opt))
+-			return false;
++			return NULL;
+ 		    }
+--- a/binutils/bfd/elf32-xtensa.c
++++ b/binutils/bfd/elf32-xtensa.c
+@@ -10073,3 +10073,3 @@
+ 
+-  removed = false;
++  removed = NULL;
+   if (is_operand_relocation (fix->src_type))
+@@ -10144,3 +10144,3 @@
+ 
+-  removed = false;
++  removed = NULL;
+   if (is_operand_relocation (ELF32_R_TYPE (orig_rel->rela.r_info)))
+--- a/binutils/bfd/elf64-ppc.c
++++ b/binutils/bfd/elf64-ppc.c
+@@ -4666,3 +4666,3 @@
+ 	  if (ent == NULL)
+-	    return false;
++	    return NULL;
+ 	  ent->next = local_got_ents[r_symndx];
+--- a/binutils/bfd/mach-o.c
++++ b/binutils/bfd/mach-o.c
+@@ -6039,3 +6039,3 @@
+   if (ncmd != 1 || uuid_cmd == NULL)
+-    return false;
++    return NULL;
+   return &uuid_cmd->command.uuid;
+--- a/binutils/bfd/xsym.c
++++ b/binutils/bfd/xsym.c
+@@ -133,3 +133,3 @@
+   if (bfd_seek (abfd, table_offset, SEEK_SET) != 0)
+-    return false;
++    return NULL;
+   return _bfd_alloc_and_read (abfd, table_size, table_size);
+--- a/binutils/binutils/prdbg.c
++++ b/binutils/binutils/prdbg.c
+@@ -2820,3 +2820,3 @@
+       abort ();
+-      return false;
++      return NULL;
+     }
+--- a/binutils/ld/pdb.c
++++ b/binutils/ld/pdb.c
+@@ -177,3 +177,3 @@
+       bfd_close (stream);
+-      return false;
++      return NULL;
+     }
+--- a/binutils/opcodes/i386-gen.c
++++ b/binutils/opcodes/i386-gen.c
+@@ -32,3 +32,5 @@
+    in preference where possible.  */
++#ifndef static_assert
+ #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); }))
++#endif
+ 
+--- a/binutils/opcodes/mips-formats.h
++++ b/binutils/opcodes/mips-formats.h
+@@ -51,3 +51,3 @@
+     typedef char ATTRIBUTE_UNUSED \
+-      static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
++      static_assert_3[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
+     static const struct mips_mapped_int_operand op = { \
+@@ -85,3 +85,3 @@
+     typedef char ATTRIBUTE_UNUSED \
+-      static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
++      static_assert_4[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
+     static const struct mips_reg_operand op = { \
+@@ -95,3 +95,3 @@
+     typedef char ATTRIBUTE_UNUSED \
+-      static_assert[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
++      static_assert_5[(1 << (SIZE)) == ARRAY_SIZE (MAP)]; \
+     static const struct mips_reg_operand op = { \
+--- a/binutils/opcodes/s390-opc.c
++++ b/binutils/opcodes/s390-opc.c
+@@ -38,3 +38,5 @@
+    in preference where possible.  */
++#ifndef static_assert
+ #define static_assert(e) ((void)sizeof (struct { int _:1 - 2 * !(e); }))
++#endif
+ 
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild
index ee5e4abfb62e..1a927aed674b 100644
--- a/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-12.0.0.ebuild
@@ -69,6 +69,7 @@ QA_CONFIG_IMPL_DECL_SKIP=(
 PATCHES=(
 	"${FILESDIR}"/gcc-12.2.0-drop-cflags-sed.patch
 	"${FILESDIR}"/gcc-14.1.0-no-omit-fp-ice.patch
+	"${FILESDIR}"/binutils-2.42-c23.patch
 )
 
 pkg_pretend() {