gentoo auto-resync : 24:10:2023 - 08:38:03

4 files changed, 196 insertions, 0 deletions

diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index ef2a69eef0ab..c55cd28d0ed4 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 20d8e746a36e..07c7827285a8 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,6 +1,7 @@
 AUX gcc-13-fix-cross-fixincludes.patch 792 BLAKE2B f16dcfee5760380931642520bf7ae939a22131183dec4f9515cabeabaa2eafbc339d4f8bdc0605bda45d840876cb8720264c4612d99510b4d7a2e4132db2403e SHA512 d65061e07c5f3089a9d39edafed94c39082dbb254cfebb386fa2fce5374e54e3e1e15a84f0de96adbe1c5ebfc33a5dad10ecbd3db851f852ec1a7521b8940fc5
 AUX gcc-14.0.0_pre20231001-pgo-bootstrap.patch 1635 BLAKE2B b866f590fd67894e891937097b2cf784309a4f48106939c1f44d5096e8b5c255db2bce3c172b38b4b622506a9aa76b586abfcae36cce931b08c2e8bdba072d93 SHA512 374a16cd48ef6c1c796f602a240c1529b1bacf500e1b098396af64c4b756467cbf17897843cabda36b8f78b00e6768ac4a32bcaf4f863513251c91c10f97d800
 AUX gcc-14.0.0_pre20231015-pycryptodome-ice.patch 7557 BLAKE2B cd6e4eb08b0546a13e02d719371c7bfff0a1d70c1eacdfb891be80663b09272f06367d747c98e9086072af8da6b39577acd8f6b4282b742542d9bd710bc734de SHA512 b9002896d83ebd77ca23826e1f59085873828c5d876f36ae177d5bf3c1a70dd1d38ea40e9622b84bd80262ce8b5f14670c01ba246c5348a913788e8be8e2e8d5
+AUX gcc-14.0.0_pre20231022-PR111860.patch 4402 BLAKE2B caee3cf499915e27afbce246e8666d5a9ad9c181a9ef4bfa8e26a9a91bc36fe47a1792afc20fae35923877fe6e67ee9a3eb39237767dfdeba58ed94d00ba3d38 SHA512 c3608faffb4fa82fb52aa97b8a5fbb442ea16dcb9043ef6d20a72adab973d6917847897849fda5e9c3ef334430a5840189882747a5099d12bf4241c2728250ef
 AUX gcc-configure-LANG.patch 2052 BLAKE2B 28c36f4992e41305ee421dade5eaaac34e3bdc523665b03f360f2bc01e8f69e9dc48052edb80dece63ab561e80325b4f125502482eb16f7324f1c03670021550 SHA512 a694c7ac2f45cc657097ff5b0cf1356ac88a9c06035c9ba15167e9d444844d0d8a478eb1b9b62195dd063774f79697b9148b9cdb6c261640b472c291061b2129
 AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097e2104e55caa28b66515cb48662649140d90b639369aedc54b2b1178fa4b49cda442f5f504e09d88a2efa45a5057c SHA512 e8d34c5077409df5495cf0c5fbf5e77f841c5698108fa6a5fde33eb28202c685603bdefd8368918e55f30c4b995e895d71d64c715c1ec2b017e09eb2c54c09ff
 DIST gcc-10-20230426.tar.xz 72118868 BLAKE2B d87cfd78d96585877abc20ed213e4d2fba36556279a5bce5d185de34a59f8cde1250d7322543533922ef224ac8508c1d3fe597c652a648e6e7f08bc19cb2f11c SHA512 805fbb840e6bd8cdd53f954b13c768c0ea0635c099094f6f0b0b04f00120dcde7cf3950a01e199d674b39ff764e9119a548b2f7a156ab2b5d598bd68ed56ce24
@@ -59,6 +60,7 @@ EBUILD gcc-13.3.9999.ebuild 1589 BLAKE2B bf6463d9ba5db2a0d494941a33cc7a2be6fd01f
 EBUILD gcc-14.0.0.9999.ebuild 1568 BLAKE2B 02ff0ed9ee64898714a411d4d6dce9ab4ed30ec1f8dce58036da4cfdd033281868c82b1a9e6da669898e405194f84be3db34cbf7a8b0144d2049558f30370b90 SHA512 5aa6f2841a026a8b021f3fd0a6ff47f11f1a7039454cb95a8af148f247792c90d08d254b16c1369e0aabf83da53add611594632a951fa075c06daee837eb27c9
 EBUILD gcc-14.0.0_pre20231015-r1.ebuild 1645 BLAKE2B eb5c8bd3e9d5d7fb53216e86ad34f63649cc8ff6727d91feb63dce57c93727697e52383015b598d18a55bb0d9a2c722fd713e78d67f6e7680cbe35585ce785be SHA512 89b19a384473f7b3336be38741342cbe757d52ddd8aabec4fa1c9b826a61ae5b8bdfff5323b3f346d4fb80b5f61c0fb054ca23c0f5c6e11119c283c7a6c73b7a
 EBUILD gcc-14.0.0_pre20231015.ebuild 1595 BLAKE2B f9c2f4064261aef1eb00db9cecb1741e97a1ccb4fe120a2e219eb81cd78ca59ea5e5cfb250079adff07a377044f9edb8de9a514fa1a3bde333e25339756223c8 SHA512 6a338c67a9637d294f551f300317c2caf54cd740858de5b51327b07b4e2aff12d7ec04eecff53be35e33a2f5d8d8cb74c381441f1e12c3d3da0a8ae1ef9c70a6
+EBUILD gcc-14.0.0_pre20231022-r1.ebuild 1637 BLAKE2B 689b9a729a3fd5a3e2c36558510aad9243a2f5064ff0f0ed8825f4f470853c190e73d1db296e199b9e33f74c161bafddedbabbd09b6f0e3835582911fd823f4b SHA512 f7b0aa65bc869132a8c480ba5516a2f18b0d8aa9d0127a15c8c1052f9413d2459a6ab32d2c49610c38da73454e0672590241a0220b8d22ec739565db416f97a4
 EBUILD gcc-14.0.0_pre20231022.ebuild 1595 BLAKE2B 6d2a145d1960bbdfa8bbdaf00048452b637e38b2bd554d6fca9a2249b82f0e2a83cb8319b744c47f53a7022cd0f0a31c597e6cada376eae3aa42d7607135d16c SHA512 cf10de604aa03f852064479eac8baaffcbb623694e25d787c8996f7003b0aa32dbc31934b979f54836cf54563b8bcaf6205a4912e84c99cf32346cb9e289e5c0
 EBUILD gcc-8.5.0-r1.ebuild 498 BLAKE2B e24f62fdb50bf2e9957cbb85c72adc96d369938a7f552735772de964f7023b8b34bd11e7e544d268cc308e25272084a728bd061f37c568d42ea65d55bb2a2e93 SHA512 f35b353e9f54eb3e1c6f8e0ea262458b41da9bddb993793aff79f765c4d93811744979d34e50c6470a9b2cfb63b7006bd284d819b7a98e56a8b3a34ae570ae76
 EBUILD gcc-9.5.0.ebuild 1206 BLAKE2B 262931215488db54cab2141549f997a48e22d0a917917eb670d41d5b155c7685e92eb1bc3843d2eca47dd15a450199aea5d99777d2870ff09b1a79ac8a63bcb0 SHA512 3737a70e70e53a581280ff1449d7d92bb9ffba0919b618ea43d4747e09b2803795a05c07c0e3a2ec8982f8d5594be58f9ac549d329b18dc236ad5159e4a47132
diff --git a/sys-devel/gcc/files/gcc-14.0.0_pre20231022-PR111860.patch b/sys-devel/gcc/files/gcc-14.0.0_pre20231022-PR111860.patch
new file mode 100644
index 000000000000..42deb046d0f3
--- /dev/null
+++ b/sys-devel/gcc/files/gcc-14.0.0_pre20231022-PR111860.patch
@@ -0,0 +1,129 @@
+https://gcc.gnu.org/PR111860
+https://gcc.gnu.org/git/gitweb.cgi?p=gcc.git;h=9ed6b22eb4188c57bb3f5cdba5a7effa95395186
+
+From 9ed6b22eb4188c57bb3f5cdba5a7effa95395186 Mon Sep 17 00:00:00 2001
+From: Tamar Christina <tamar.christina@arm.com>
+Date: Mon, 23 Oct 2023 14:07:20 +0100
+Subject: [PATCH] middle-end: don't keep .MEM guard nodes for PHI nodes who
+ dominate loop [PR111860]
+
+The previous patch tried to remove PHI nodes that dominated the first loop,
+however the correct fix is to only remove .MEM nodes.
+
+This patch thus makes the condition a bit stricter and only tries to remove
+MEM phi nodes.
+
+I couldn't figure out a way to easily determine if a particular PHI is vUSE
+related, so the patch does:
+
+1. check if the definition is a vDEF and not defined in main loop.
+2. check if the definition is a PHI and not defined in main loop.
+3. check if the definition is a default definition.
+
+For no 2 and 3 we may misidentify the PHI, in both cases the value is defined
+outside of the loop version block which also makes it ok to remove.
+
+gcc/ChangeLog:
+
+	PR tree-optimization/111860
+	* tree-vect-loop-manip.cc (slpeel_tree_duplicate_loop_to_edge_cfg):
+	Drop .MEM nodes only.
+
+gcc/testsuite/ChangeLog:
+
+	PR tree-optimization/111860
+	* gcc.dg/vect/pr111860-2.c: New test.
+	* gcc.dg/vect/pr111860-3.c: New test.
+---
+ gcc/testsuite/gcc.dg/vect/pr111860-2.c | 17 +++++++++++++++++
+ gcc/testsuite/gcc.dg/vect/pr111860-3.c | 17 +++++++++++++++++
+ gcc/tree-vect-loop-manip.cc            | 21 ++++++++++++++++++++-
+ 3 files changed, 54 insertions(+), 1 deletion(-)
+ create mode 100644 gcc/testsuite/gcc.dg/vect/pr111860-2.c
+ create mode 100644 gcc/testsuite/gcc.dg/vect/pr111860-3.c
+
+diff --git a/gcc/testsuite/gcc.dg/vect/pr111860-2.c b/gcc/testsuite/gcc.dg/vect/pr111860-2.c
+new file mode 100644
+index 000000000000..07f64ffb5318
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/vect/pr111860-2.c
+@@ -0,0 +1,17 @@
++/* { dg-do compile } */
++/* { dg-options "-O -fno-tree-sink -ftree-vectorize" } */
++int buffer_ctrl_ctx_0, buffer_ctrl_p1, buffer_ctrl_cmd;
++
++int
++buffer_ctrl (long ret, int i)
++{
++  switch (buffer_ctrl_cmd)
++    {
++    case 1:
++      buffer_ctrl_ctx_0 = 0;
++      for (; i; i++)
++	if (buffer_ctrl_p1)
++	  ret++;
++    }
++  return ret;
++}
+diff --git a/gcc/testsuite/gcc.dg/vect/pr111860-3.c b/gcc/testsuite/gcc.dg/vect/pr111860-3.c
+new file mode 100644
+index 000000000000..07f64ffb5318
+--- /dev/null
++++ b/gcc/testsuite/gcc.dg/vect/pr111860-3.c
+@@ -0,0 +1,17 @@
++/* { dg-do compile } */
++/* { dg-options "-O -fno-tree-sink -ftree-vectorize" } */
++int buffer_ctrl_ctx_0, buffer_ctrl_p1, buffer_ctrl_cmd;
++
++int
++buffer_ctrl (long ret, int i)
++{
++  switch (buffer_ctrl_cmd)
++    {
++    case 1:
++      buffer_ctrl_ctx_0 = 0;
++      for (; i; i++)
++	if (buffer_ctrl_p1)
++	  ret++;
++    }
++  return ret;
++}
+diff --git a/gcc/tree-vect-loop-manip.cc b/gcc/tree-vect-loop-manip.cc
+index d67c94700144..43ca985c53ce 100644
+--- a/gcc/tree-vect-loop-manip.cc
++++ b/gcc/tree-vect-loop-manip.cc
+@@ -1626,12 +1626,31 @@ slpeel_tree_duplicate_loop_to_edge_cfg (class loop *loop, edge loop_exit,
+ 	  edge temp_e = redirect_edge_and_branch (exit, new_preheader);
+ 	  flush_pending_stmts (temp_e);
+ 	}
+-
+       /* Record the new SSA names in the cache so that we can skip materializing
+ 	 them again when we fill in the rest of the LCSSA variables.  */
+       for (auto phi : new_phis)
+ 	{
+ 	  tree new_arg = gimple_phi_arg (phi, 0)->def;
++
++	  if (!SSA_VAR_P (new_arg))
++	    continue;
++	  /* If the PHI MEM node dominates the loop then we shouldn't create
++	      a new LC-SSSA PHI for it in the intermediate block.   */
++	  /* A MEM phi that consitutes a new DEF for the vUSE chain can either
++	     be a .VDEF or a PHI that operates on MEM. And said definition
++	     must not be inside the main loop.  Or we must be a parameter.
++	     In the last two cases we may remove a non-MEM PHI node, but since
++	     they dominate both loops the removal is unlikely to cause trouble
++	     as the exits must already be using them.  */
++	  if (virtual_operand_p (new_arg)
++	      && (SSA_NAME_IS_DEFAULT_DEF (new_arg)
++		  || !flow_bb_inside_loop_p (loop,
++				gimple_bb (SSA_NAME_DEF_STMT (new_arg)))))
++	    {
++	      auto gsi = gsi_for_stmt (phi);
++	      remove_phi_node (&gsi, true);
++	      continue;
++	    }
+ 	  new_phi_args.put (new_arg, gimple_phi_result (phi));
+ 
+ 	  if (TREE_CODE (new_arg) != SSA_NAME)
+-- 
+2.39.3
diff --git a/sys-devel/gcc/gcc-14.0.0_pre20231022-r1.ebuild b/sys-devel/gcc/gcc-14.0.0_pre20231022-r1.ebuild
new file mode 100644
index 000000000000..568120f07c07
--- /dev/null
+++ b/sys-devel/gcc/gcc-14.0.0_pre20231022-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_GCC_VER="14.0.0"
+PATCH_VER="6"
+MUSL_VER="1"
+MUSL_GCC_VER="14.0.0"
+
+if [[ ${PV} == *.9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=1
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$((${MY_PV_2} - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+elif [[ -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=master
+elif [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	# Don't keyword live ebuilds
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~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=">=${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}"/${P}-PR111860.patch
+	eapply_user
+}