gentoo auto-resync : 27:05:2024 - 00:07:23

3 files changed, 58 insertions, 107 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 1cdd103ba092..c636fbec1268 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,5 +1,4 @@
 AUX gcc-13-fix-cross-fixincludes.patch 854 BLAKE2B 3dc52dc6b1ed7e86ae5a0a48b79dc5020f2abcbb4db6735479595ce88e259eb8fe933a5619408a29997c00966481f5b3cd3a412eb63517aa26b6babb3afac612 SHA512 666f9343594c5ffa4ea01e7cbfb8c79d95ffc3a5215dbc16a3f964cb73de552863aa578758d2ffcb0dfd36764ec65389b5abacf6dd12c941c129f39c8117fff2
-AUX gcc-14.1.0-emacs-PR114965.patch 3652 BLAKE2B 8b7a072607a81e02ee8a624615acd2248b101bf157c46d2648a3e6e9f1269bf3dd8ca60d63094945e2dbe58027a1489ab2987cd90e1818bcc451ce82e39a544c SHA512 a9f2a8ae26a584945e352755dbcf29f7ea1424f9d89da39d79070519dcdc207814703f3840030ba02132f6b0c3db64a3ddf5027918adb50e135418e44b2d718f
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10.5.0-musl-patches-2.tar.xz 3452 BLAKE2B 5387e516d07d81477b3f39b8b3bd986bf861d32cd25dc5481c97bd3620d00c918c5661e86857f66dbf28a655401a53e43417f638c443e44cbfdbf5e950caac4d SHA512 86f2ce31cc4fc4fb5a6043fb527bf822d895e1a6220652024f78a1cbd5a962edb6be8dc5f43c32053e075f39bb2350ea8f14e7d57e0473dd2933a7b44676bde5
 DIST gcc-10.5.0-patches-6.tar.xz 18208 BLAKE2B 4cac3340108fb378c76ad62b728429f3c97f348d178744e7536575f3576ca8aa682b878b7df3b1c162dccae64a3cb56c66d8d60eae323e1ece2de4278084fdbd SHA512 9d6c84325fbc118cee01347468ce729c278e5b026b16da945fe54050726e26f86a46ee7b71a01a47cf927b70bfcce459c49a6bc4fb93dcfaa047c76d4c5bc5bc
@@ -25,6 +24,7 @@ DIST gcc-13.2.0-patches-15.tar.xz 47052 BLAKE2B f145341813d6baf9cbcc3e8421c7f427
 DIST gcc-13.2.0-patches-16.tar.xz 44792 BLAKE2B 0b6b584d68e69685638695596b780249ca0119ad362747a82d886fd10f77ceb05d02e033e906a090c67f44b1977f40df6a95206d81a32dd15e2f5413c6c92496 SHA512 324d9e63d16c35d55edde20de049162c01b0d487b4548d06c49f0da04a761ec255bc5e020cc2e7f60d12f5d129768afdcf7c86a59126f71f388ab375c34be6de
 DIST gcc-13.3.0.tar.xz 87909952 BLAKE2B 0f3728b026bd8aab0e469dda54facf157a4b753d3405a74b0be6105a6e3a493d26df4007d90ae4e05d86277d41873312638f9589d1757cee80ca84de7f2099e3 SHA512 ed5f2f4c6ed2c796fcf2c93707159e9dbd3ddb1ba063d549804dd68cdabbb6d550985ae1c8465ae9a336cfe29274a6eb0f42e21924360574ebd8e5d5c7c9a801
 DIST gcc-14-20240518.tar.xz 87946040 BLAKE2B 83e567d680b1463cc672fb461aa180cf46555911f0e91a3fb89b11fe8b81d12d64b3a3419953849cf2deb38f1cdf0defc05169c145964f74c1105d942b5519f9 SHA512 73dae806add90e8b3cdfe1c56754ae886f6f6150ef4ef217664b48507ff19d20933648bb6a19ab62756146e83e4df037ced30e4504d562966c40b3750475f28f
+DIST gcc-14-20240525.tar.xz 87961136 BLAKE2B 89898dfb5ce7e135f02e88e476df6aa48d7f809ac695328d51d1dc8deec89537c0da80d542a0063d718aad45f10fc192d2540caeb0ba8f6aa61a88410de47166 SHA512 ad4a3ada606df91836a145b9b78d96251760a42ff6c879a558a16889f708aca3626dfbb2abbaff3c87107ea17a088a216dbe139399bd766ba8bb0b9231285f1c
 DIST gcc-14.1.0-musl-patches-1.tar.xz 3600 BLAKE2B 4cd920b7ca1f122cae806707564d8e45bfd48e78c88788a12a301f6068b5a5f335d8885e67479ac536c66aeaa81f2ecb7240ae56e9fc821a7246ab66b453711f SHA512 61c48d90a55dfc2129d96aee69d939d6a89f6407f69f7bd12c1a619f28989f471fd219d731958f8e62b0fd650c32300f0ad8dc06d5df23d9fc8c1a77fe210c25
 DIST gcc-14.1.0-patches-1.tar.xz 11584 BLAKE2B d483f4e3324acdc26b9837028d5e20ad0cdcf3ef4bcc78a6902d63ceebc7e5ff70c8163f6a8c8e36405df47c59dd2df506147c53ce51a8ec73494e65b5902647 SHA512 3d7aea113b594d1896c93e9e6be85f467488fa75de2800ed76eab2f87cef26829b235d1f361b187e38cf13b0fb9518cd4431c3106ec1e49d0f744e7eb703eaa0
 DIST gcc-15-20240519.tar.xz 88058724 BLAKE2B b9a9a93132fac8f827cd9f293fa09a4705084a420072da27161792a9c5f84a8fc9f28b15e878a5e7872579d4e89ae2e383b025d0529cf9e11c7f87454d61d62f SHA512 00eaf263d3eafb8b1ff101d703d9d82a770a79dd5484a6e69adb53889313ad300b65ac5159564950921985178546475cc26d760395ca68b4a6d4433ff26a6ffc
@@ -52,6 +52,7 @@ EBUILD gcc-13.3.0.ebuild 1722 BLAKE2B cabfc4c8611616f03565bdb7666005357f6fe7094e
 EBUILD gcc-13.3.1_p20240524.ebuild 1727 BLAKE2B 065a4591a1dfdd5dc6fa3a8ccf646a262466db69a4a3cde6fd51b0e9043dabcee3c0ec80ef027d5b8c7c8e57cf98152e8bddcf3a16766be5b70299cb6c53bf5c SHA512 8c5bf7c53185492760fb23fc5b656b59820bb9a1a4f607f76cb4d1392b096de2142b65ab035b5a5e40d48ffa7d641b563ee9a1a2f1343ff8eed6658f60f5f97d
 EBUILD gcc-13.4.9999.ebuild 1722 BLAKE2B cabfc4c8611616f03565bdb7666005357f6fe7094efa4a14fde7537f859166e0e195865040fe5141cd9391b1e97fd6dd436cfda61e3cd8c6661cbe536bf5f653 SHA512 7bce4bb5e4ca395c954f0e458cb43453e31af06b1cba5dfb00f7915a442d83ae53a3c8500f0dd8e491ac1238e3d954ffff78e4b332cde912623689e44fe2c127
 EBUILD gcc-14.1.1_p20240518.ebuild 1619 BLAKE2B 45cf6627b223638287177489e67c70cbcb09bedacefcadbe0165c05270ee2d56459fe9bc1d209e84ebb9470a038ec75c7e57881bd7e202ae0aae66ef94bc3b98 SHA512 2ab7c3c0d46b690e60ebaa3582b71cc3b0cd7930767888699825674b82e680dddcb4ff40552ad77c9c1d576f21ad98e6255b46cf6e7dc21f10252f8a73db9308
+EBUILD gcc-14.1.1_p20240525.ebuild 1620 BLAKE2B a10ec2a07311f6cc493133883aedb1b9525a3b01397600e2d6e9e86f13a7d01a662545d962e5c5583f502257451c8c122c4afda0a36cd58fe8ca7952a9a98c5b SHA512 73649bcec11370de89a572bbbda1a1bb2dd0df68ca27e72a97b22b46558349f0aa643a656007f7c9619206e5eb112476e44043c563c7ed4747df014fd1a8a31f
 EBUILD gcc-14.1.9999.ebuild 1453 BLAKE2B caee7ba2e0323b0953b53c822cfe76c70eebd466d80575612ae6daffdfbdb663266a9272691b33c4396bf8c70c81cf3c64035d9c5159f1ba9ed1e231ce739c1f SHA512 b1cc3de6f9f03b6e6558824cec9c19c8b4c424c769f8d02c0675c20f6c687b2ac27fb8d19646feb221570611e35248b8c22334b9207d27c401a5c34a54e34652
 EBUILD gcc-15.0.0_pre20240519.ebuild 1402 BLAKE2B 9fa3487167283d7c6fe3f45dcf92bc5895bd261554dd5238fb42f0477de509e6d8843378831a0a2498827dbcd4b1cc887266292e2f30d80e4884761b654a94e5 SHA512 c6e5f95caa03472a0f030f8a0d84c29b226eadbb28bd542baca56dbe9b03121f1bfbe52a42d7b2700be00412b8b6f0d40292520352cbe25ac27114856f4a8e11
 EBUILD gcc-15.0.9999.ebuild 1375 BLAKE2B 713f557e8ccda4a146eb0286c1d42c1ccf144937450190dff66be5a280abc345951cd43c563f3a3436cdfa5c9e6a077d59132e3f8f7fc9d472803b8024624abe SHA512 624abe83fbc0654e5f2104fa29499fc26ecdc8d5a923f653981c79f93c982c1f43bb75005b61239bd1fe8490d1cf64afd28a454a5d1bc72c51369cde1656524a
diff --git a/sys-devel/gcc/files/gcc-14.1.0-emacs-PR114965.patch b/sys-devel/gcc/files/gcc-14.1.0-emacs-PR114965.patch
deleted file mode 100644
index df4fcee90c51..000000000000
--- a/sys-devel/gcc/files/gcc-14.1.0-emacs-PR114965.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=d54151df3ba0ee3203e0b8cb8f8fcd168a766c51
-https://gcc.gnu.org/PR114965
-
-From d54151df3ba0ee3203e0b8cb8f8fcd168a766c51 Mon Sep 17 00:00:00 2001
-From: Jakub Jelinek <jakub@redhat.com>
-Date: Wed, 8 May 2024 10:17:32 +0200
-Subject: [PATCH] reassoc: Fix up optimize_range_tests_to_bit_test [PR114965]
-
-The optimize_range_tests_to_bit_test optimization normally emits a range
-test first:
-          if (entry_test_needed)
-            {
-              tem = build_range_check (loc, optype, unshare_expr (exp),
-                                       false, lowi, high);
-              if (tem == NULL_TREE || is_gimple_val (tem))
-                continue;
-            }
-so during the bit test we already know that exp is in the [lowi, high]
-range, but skips it if we have range info which tells us this isn't
-necessary.
-Also, normally it emits shifts by exp - lowi counter, but has an
-optimization to use just exp counter if the mask isn't a more expensive
-constant in that case and lowi is > 0 and high is smaller than prec.
-
-The following testcase is miscompiled because the two abnormal cases
-are triggered.  The range of exp is [43, 43][48, 48][95, 95], so we on
-64-bit arch decide we don't need the entry test, because 95 - 43 < 64.
-And we also decide to use just exp as counter, because the range test
-tests just for exp == 43 || exp == 48, so high is smaller than 64 too.
-Because 95 is in the exp range, we can't do that, we'd either need to
-do a range test first, i.e.
-if (exp - 43U <= 48U - 43U) if ((1UL << exp) & mask1))
-or need to subtract lowi from the shift counter, i.e.
-if ((1UL << (exp - 43)) & mask2)
-but can't do both unless r.upper_bound () is < prec.
-
-The following patch ensures that.
-
-2024-05-08  Jakub Jelinek  <jakub@redhat.com>
-
-	PR tree-optimization/114965
-	* tree-ssa-reassoc.cc (optimize_range_tests_to_bit_test): Don't try to
-	optimize away exp - lowi subtraction from shift count unless entry
-	test is emitted or unless r.upper_bound () is smaller than prec.
-
-	* gcc.c-torture/execute/pr114965.c: New test.
-
-(cherry picked from commit 9adec2d91e62a479474ae79df5b455fd4b8463ba)
----
- .../gcc.c-torture/execute/pr114965.c          | 30 +++++++++++++++++++
- gcc/tree-ssa-reassoc.cc                       |  3 +-
- 2 files changed, 32 insertions(+), 1 deletion(-)
- create mode 100644 gcc/testsuite/gcc.c-torture/execute/pr114965.c
-
-diff --git a/gcc/testsuite/gcc.c-torture/execute/pr114965.c b/gcc/testsuite/gcc.c-torture/execute/pr114965.c
-new file mode 100644
-index 000000000000..89d68e187015
---- /dev/null
-+++ b/gcc/testsuite/gcc.c-torture/execute/pr114965.c
-@@ -0,0 +1,30 @@
-+/* PR tree-optimization/114965 */
-+
-+static void
-+foo (const char *x)
-+{
-+
-+  char a = '0';
-+  while (1)
-+    {
-+      switch (*x)
-+	{
-+	case '_':
-+	case '+':
-+	  a = *x;
-+	  x++;
-+	  continue;
-+	default:
-+	  break;
-+	}
-+      break;
-+    }
-+  if (a == '0' || a == '+')
-+    __builtin_abort ();
-+}
-+
-+int
-+main ()
-+{
-+  foo ("_");
-+}
-diff --git a/gcc/tree-ssa-reassoc.cc b/gcc/tree-ssa-reassoc.cc
-index 61f54f07b577..556ecdebe2d7 100644
---- a/gcc/tree-ssa-reassoc.cc
-+++ b/gcc/tree-ssa-reassoc.cc
-@@ -3418,7 +3418,8 @@ optimize_range_tests_to_bit_test (enum tree_code opcode, int first, int length,
- 	     We can avoid then subtraction of the minimum value, but the
- 	     mask constant could be perhaps more expensive.  */
- 	  if (compare_tree_int (lowi, 0) > 0
--	      && compare_tree_int (high, prec) < 0)
-+	      && compare_tree_int (high, prec) < 0
-+	      && (entry_test_needed || wi::ltu_p (r.upper_bound (), prec)))
- 	    {
- 	      int cost_diff;
- 	      HOST_WIDE_INT m = tree_to_uhwi (lowi);
--- 
-2.39.3
diff --git a/sys-devel/gcc/gcc-14.1.1_p20240525.ebuild b/sys-devel/gcc/gcc-14.1.1_p20240525.ebuild
new file mode 100644
index 000000000000..05c6bd6ce397
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.1.1_p20240525.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="14.1.0"
+PATCH_VER="1"
+MUSL_VER="1"
+MUSL_GCC_VER="14.1.0"
+PYTHON_COMPAT=( python3_{10..12} )
+
+if [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="mirror://gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+
+if tc_is_live ; then
+	# Needs to be after inherit (for now?), bug #830908
+	EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	# m68k doesnt build (ICE, bug 932733)
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	:;
+fi
+
+if [[ ${CATEGORY} != cross-* ]] ; then
+	# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+	# If GCC is enabling CET by default, we need glibc to be built with support for it.
+	# bug #830454
+	RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+	DEPEND="${RDEPEND}"
+	BDEPEND="amd64? ( >=${CATEGORY}/binutils-2.30[cet(-)?] )"
+fi
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply "${FILESDIR}"/${PN}-13-fix-cross-fixincludes.patch
+	eapply_user
+}