gentoo auto-resync : 27:10:2023 - 08:42:41

3 files changed, 66 insertions, 46 deletions

diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 07c7827285a8..7e86a8e81b60 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,5 +1,4 @@
 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
@@ -13,6 +12,7 @@ DIST gcc-11-20230622.tar.xz 76199316 BLAKE2B a769dc6be63eabca3bc33944b471d727bf2
 DIST gcc-11-20230824.tar.xz 76202120 BLAKE2B 243ce16e28c66d681bb27df32866947309f8fa386e258896651b6853e390da79304250669096fd55cafe0a9d5adf4b3a3cf5989302f4ad13660ece80639b545a SHA512 a9cab8bf61f2a572baba73a2a11271eeb61d43f07411df376a8568820c1373f64f635d747933fda1e942ae717b0ae9f1c810f662fc09ccb075940248bc48b582
 DIST gcc-11-20231012.tar.xz 76228876 BLAKE2B f48d440cefdad9eb021116b72ba41a7cb8b3af904abafb26bd49113f3bdaacbeab86f3d7a783130ea1a1f8c6556d1dc83b8176ae96973c524dc8606443e0be0a SHA512 7cae1a36a113e0184b1c10c7892a808a6ec38ecd4b1c482d589717c68474873093eebd68465694344ee1208d0e118f5d91b3a19f981da22dfa95ee86663572bb
 DIST gcc-11-20231019.tar.xz 76228604 BLAKE2B cc1278eb4beb598d81b1629fe72095487709f9e1a7229dba0512ba8273767b05e79c7c02104a1aa28b699d42ef0f10f7b960f1a37693c1508df9846edfe80b82 SHA512 f98ce83e0d75fe4459e1852d900924e8e3c31853ba54e38e46f040f4d109726b6c171bbb51e9230c459d617c3c8ac37708ef65997d6797a1686b60cdca3107a0
+DIST gcc-11-20231026.tar.xz 76243752 BLAKE2B bdd28659a0ddf9aea98c989377260586aea746cde8fbc082d52944032c02209d67f633c295a7bebcb7bf8a8df081430110cbdf749ceacd9250263629d57797df SHA512 9c2a47465c7143b645df9e863faec4e6d80d158598262b59eaf248d900f73aeddbcd045b37b7015f2ba87c11c8beb3ae7d63fdda974160fef785e0648eb72d92
 DIST gcc-11.4.0-musl-patches-2.tar.xz 4308 BLAKE2B a2335e155fc57816fed822a648e0eaefafcba9d04e1ad0fd7baeea5a694ab6f5e3c1678cb406f2a1bd17bab25cb01699d032713a1ccf337948dfda2093844607 SHA512 17b84f907cb1bd763873655e6f35fd3ed55a40b602b70a626f04f83b4cc89c6261db1661de78d4d969187a8c56e9f6305b742515a3836b962248a21df0df5d0c
 DIST gcc-11.4.0-patches-10.tar.xz 13852 BLAKE2B 54937d13e30e2a5303c7e197fae09eeed35ca0b9783625e02578fcee829b5503fb22d664366322b304df7d01ae807d00af7c93db3e3ceebe4851e15647724f87 SHA512 31b4d7a2e7cc589e92e12c3583d13d41c523cafbd309bc0532df9b68ea2473c89daef4c0edd3ce2917b5823d81a7792f145b9449f16277d0d64c22ceff50bbb9
 DIST gcc-11.4.0-patches-9.tar.xz 14704 BLAKE2B 9aa2ecbac493d3040694e9930738e57d59a764b90ab92b91709c319b883f28ad108767e5d11e8b62af40bf1e583d5ff83a03e8c895f904bc6f41315ce9ab4f0a SHA512 ac8b7c6c382ffacc4e9d08299440fc237fa366ec36fb8eb7a8d426b64a4186384a262e6380dc83ed7f7240125ce26a8435c8a4e0e13976ef2652067a7129bd17
@@ -46,6 +46,7 @@ EBUILD gcc-11.4.1_p20230622.ebuild 1606 BLAKE2B 924d534546975cbf01081d73b46b56f9
 EBUILD gcc-11.4.1_p20230824.ebuild 1614 BLAKE2B 76541d8ec0819f2ced3ac9ecc63b7f7fdee3716226b8cb1d1ae1d1115e2ba9c653cfb25e711289d263bce7b75c6812f24bd381ca84c8dbf33ee840f08765f8b7 SHA512 221b1b8aee3fe8d9db2bfc17f25cc59e473960307c95b0991bdae2b8258c889f2765514d27015621cd000e609f14110cb341ffe26054b42444e12a51fff19188
 EBUILD gcc-11.4.1_p20231012.ebuild 1615 BLAKE2B af739962d08d8a4866104d8583cac167b027737353abf34be5c9c64f463ecf28c1d6eb67f210a39964779a7b2d0adc8e2e052aa15aace5499428f7082c99cdf2 SHA512 a175a89736344022b27199d4f36bb95914c2fdce49787a98bdcd798e6ab1a2d1e8d55769301950472999ba51fbf9bae9b86d3f9914964f361e9a9b526de74170
 EBUILD gcc-11.4.1_p20231019.ebuild 1615 BLAKE2B af739962d08d8a4866104d8583cac167b027737353abf34be5c9c64f463ecf28c1d6eb67f210a39964779a7b2d0adc8e2e052aa15aace5499428f7082c99cdf2 SHA512 a175a89736344022b27199d4f36bb95914c2fdce49787a98bdcd798e6ab1a2d1e8d55769301950472999ba51fbf9bae9b86d3f9914964f361e9a9b526de74170
+EBUILD gcc-11.4.1_p20231026.ebuild 1615 BLAKE2B af739962d08d8a4866104d8583cac167b027737353abf34be5c9c64f463ecf28c1d6eb67f210a39964779a7b2d0adc8e2e052aa15aace5499428f7082c99cdf2 SHA512 a175a89736344022b27199d4f36bb95914c2fdce49787a98bdcd798e6ab1a2d1e8d55769301950472999ba51fbf9bae9b86d3f9914964f361e9a9b526de74170
 EBUILD gcc-11.5.9999.ebuild 1582 BLAKE2B a5b94704a65afc32a3079ad0732b544c03413a9f4965ccf1c2718fd763dc29b7a64e54b8cbb492d52e93527e3f0d4966d17eb6b6cb81fd609c6629d19f6b124d SHA512 bd165193f6ef2b12930bac05c8c3f75f6bafd143a13ed5c2960f7a1d8039608ca23ccbffe9a6b235d42c789d117e29cb3d47998c71a4a3eba30a63b8b9e0f116
 EBUILD gcc-12.3.1_p20230526.ebuild 1609 BLAKE2B a242d9a7eedbf244d1a43ec5d9f8e89e82e15fdfc2a0188dafcd5ee3050dd68e20cb765e06eeae92f1b4b965b9f678bd23786291d207984afe0365728f71a327 SHA512 a844ec1b656ade09280433231828e28bdfac9750e277fb5f7b2c905199f62d1f3d59c5c283706f8e80d8f8e5059a7529cd0b5a3c224a55b6e97faa335b8ebe74
 EBUILD gcc-12.3.1_p20230825.ebuild 1613 BLAKE2B d0c6b99a1c529b7a518fc86b5d03c279dba37d111b0a356e416b8601f066cec460761ed14d0a4ef5faa6f16fb9af29baaf9bcb17edd55f5604d9bf012c579fd3 SHA512 b23bffb263e68b7f5045bfdf79538cb1e1abf4a4d789db7b915d586f10ebecf74a9d59715c8db5c2dd57545e559bdf72bec39a76ba50ddb13efc9db66982d56e
diff --git a/sys-devel/gcc/files/gcc-14.0.0_pre20231001-pgo-bootstrap.patch b/sys-devel/gcc/files/gcc-14.0.0_pre20231001-pgo-bootstrap.patch
deleted file mode 100644
index 31ad7d855268..000000000000
--- a/sys-devel/gcc/files/gcc-14.0.0_pre20231001-pgo-bootstrap.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/914998
-https://gcc.gnu.org/PR111642
-https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=e465e5e4a969334f64cf0d6611de5273d73ea732
-
-From e465e5e4a969334f64cf0d6611de5273d73ea732 Mon Sep 17 00:00:00 2001
-From: Richard Sandiford <richard.sandiford@arm.com>
-Date: Mon, 2 Oct 2023 07:20:45 +0100
-Subject: [PATCH] Fix profiledbootstrap poly_int fallout [PR111642]
-
-rtl-tests.cc and simplify-rtx.cc used partial specialisation
-to try to restrict the NUM_POLY_INT_COEFFS>1 tests without
-resorting to preprocessor tests.  That now triggers an error
-in some configurations, since the NUM_POLY_INT_COEFFS>1 tests
-used the global poly_int64, whose definition does not depend
-on the template parameter.
-
-This patch uses local types that do depend on the template parameter.
-
-gcc/
-	PR bootstrap/111642
-	* rtl-tests.cc (const_poly_int_tests<N>::run): Use a local
-	poly_int64 typedef.
-	* simplify-rtx.cc (simplify_const_poly_int_tests<N>::run): Likewise.
---- a/gcc/rtl-tests.cc
-+++ b/gcc/rtl-tests.cc
-@@ -246,6 +246,7 @@ template<unsigned int N>
- void
- const_poly_int_tests<N>::run ()
- {
-+  using poly_int64 = poly_int<N, HOST_WIDE_INT>;
-   rtx x1 = gen_int_mode (poly_int64 (1, 1), QImode);
-   rtx x255 = gen_int_mode (poly_int64 (1, 255), QImode);
- 
---- a/gcc/simplify-rtx.cc
-+++ b/gcc/simplify-rtx.cc
-@@ -8689,6 +8689,7 @@ template<unsigned int N>
- void
- simplify_const_poly_int_tests<N>::run ()
- {
-+  using poly_int64 = poly_int<N, HOST_WIDE_INT>;
-   rtx x1 = gen_int_mode (poly_int64 (1, 1), QImode);
-   rtx x2 = gen_int_mode (poly_int64 (-80, 127), QImode);
-   rtx x3 = gen_int_mode (poly_int64 (-79, -128), QImode);
--- 
-2.39.3
diff --git a/sys-devel/gcc/gcc-11.4.1_p20231026.ebuild b/sys-devel/gcc/gcc-11.4.1_p20231026.ebuild
new file mode 100644
index 000000000000..02c58f02f0a6
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.4.1_p20231026.ebuild
@@ -0,0 +1,64 @@
+# 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="11.4.0"
+PATCH_VER="10"
+MUSL_VER="2"
+MUSL_GCC_VER="11.4.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=releases/gcc-$(ver_cut 1)
+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_user
+}