gentoo resync : 02.02.2022

4 files changed, 33 insertions, 6 deletions

diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 4730bea8847b..d10bf408d292 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -24,7 +24,7 @@ EBUILD binutils-2.34-r2.ebuild 11770 BLAKE2B 7cb3c8bbeb0ae93677d13f8c036a8886e2d
 EBUILD binutils-2.35.2.ebuild 12651 BLAKE2B d97d3cfab222e74e94bdc5d462bf95f9d39cd62ffc686982598a8041b6bda0358ab39fcf4cfdd6fda3b444859db97c39a50971032008dbd982301e1afff94b41 SHA512 6c6820a8206cb8cf5d4df8e1c1e5448e0a3ba77ab067bc49525787beadad464aef27fb04debbfde4720a3a44b02a4206fd4b3c4d18eb19428a7d98254753fd05
 EBUILD binutils-2.36.1-r2.ebuild 12553 BLAKE2B 8ce3d14f6d7cc81e920f7d5a28875a5bcc45b396169afe5a6e4429849eb9b420977f39fd85487d3ef93a2aef838c6122413b7ef5c9f8c6273d9d1b1bf5b4608a SHA512 53935fec45e8241e73c76be22dde5e9576360cb511642bb5fded59515ea0641cbcb7eb6bd6eef2f30d6d4e940cf1869908c96b194ec1f5e9a016664a5c6cf2eb
 EBUILD binutils-2.37_p1-r1.ebuild 12893 BLAKE2B 55fb00ec7c769b8675fd33e8ac5887681c9ee974eddcf1274172d4578b851d42f1fbe32ef7fae1343b56e90250a3a4cd16181b8432e910568929e500d14c5c2e SHA512 5d635a9ed125e047dfda42f2f5bfc13ef633be8bc0c8aef64bb920beceac809d7f767f5aa928547226642db545292aa3165d44d0d9680cdcda3b47496e934e88
-EBUILD binutils-2.37_p1-r2.ebuild 12894 BLAKE2B 0f794e4b8f36d62b89f12c6a6d17711a2359d4ee002e654dce71a8ba19ff7ea74cdf604dadacd0f553c6fb115280182660fa373e016943b2420908ad7b25c9ad SHA512 6fb31f9764f2a4bace454a3fbf6a30508b2133798a2dc2f3487405d6023719ccb65bd4e38bbc97925cd5b2262fca01ddf262b89540c61723263a0b9b8748cad2
+EBUILD binutils-2.37_p1-r2.ebuild 13104 BLAKE2B 5cab6a526f020cb97199aa23562fd3f4125ff61d5fe01128f6d390e35a5382ce6b2b65256599321a5ab90ae7b15e8758b292673b42f3ddd78685b35d997448c3 SHA512 9eb101d1f4ae1c57b87b809967e8c585f0d15df66ff9e1b2da91f8c84a6c0d3c97b68561089b57148500d0081cc371d49710eb63b4330f84913908dd513b96ed
 EBUILD binutils-2.37_p1.ebuild 12839 BLAKE2B 6ddb1dd33f47b27784bde21981e8ab8fd70499660a22ff09383c501007e92336ffa07355325c9eab1aa729fa6cd058e1eccc0937ca69a7ee4f93183ff79ac7f7 SHA512 59949998a9d1ba991839262e8e48c5178c24df1b74d66b2556766f3afe53c1ac041dcb5058b5c09508e9cb97d33f06b3c3357446039c6a9806e1c0cbfb3a1099
-EBUILD binutils-9999.ebuild 12909 BLAKE2B fbf051ba26d9e2ebf14c5f9ad672d0cf770e8e4c87e3f3f30d79ea0b43338fcbe3aacdf64b0168a6da53c0fa183a37837d671ab4ecac4b21dc48bdd7b371a8c2 SHA512 165b1233f1941cd939c2fcefec316cafe2feab5fbf1358bc6eaf6d475b636e397b21a65ca7871dc8f5fefc90c7cdf5081ec566db724b567211bd8548606e3c0c
-MISC metadata.xml 727 BLAKE2B 4ee6dbcec8f8ec7e5fe028344dcad9689e6d4edd1871a4b9f6b28952edafa2dd41df7e03f3a72d3fcf5853a791f7a77a5aa08108d24ae9589e7c0c98b564ddad SHA512 999c1f33f4a25ab6b8e1ede0862e9ad849dd44366236914f2558cc9377336d49989e592973625d9833ad238645e918d7341817e2170ff6a6029b40f7addb775c
+EBUILD binutils-9999.ebuild 13120 BLAKE2B dcc2dac9955128469396268583cde8b7b9db750c062b21ecdea8d1fdf22bcd8b4fcbfad9c8196011ad6592f792153ab8beb9ea148aed6a6af0687cb7dfb4dfe1 SHA512 1a83c0ea7369808c998f9d285473c95ab80d0b31bd4109eda70d7949415b9795b29575b691bfdd15a84bfb23e779bf40222071bb9e59c522ba9f629595dd4212
+MISC metadata.xml 815 BLAKE2B 0d866827f8a6d0244be472dea595d5784ea60464ba361cde9bd062473b5eb19ccecc99bb58729acadd2cfe7dc017cdb2107fc282a31be6ed96c757954e6c9ac0 SHA512 8996f29b159ba483293b8d80eb62372ee0016e817d9ac55b7de9c211aca770b5a05135e705aac108099181d879daf5e22df1facab64bc7765966b3d7e3274e16
diff --git a/sys-devel/binutils/binutils-2.37_p1-r2.ebuild b/sys-devel/binutils/binutils-2.37_p1-r2.ebuild
index cfdd2538eefe..438f371da3b9 100644
--- a/sys-devel/binutils/binutils-2.37_p1-r2.ebuild
+++ b/sys-devel/binutils/binutils-2.37_p1-r2.ebuild
@@ -8,7 +8,7 @@ inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
 LICENSE="GPL-3+"
-IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test vanilla"
+IUSE="cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla"
 REQUIRED_USE="default-gold? ( gold )"
 
 # Variables that can be set here  (ignored for live ebuilds)
@@ -32,7 +32,7 @@ else
 	[[ -z ${PATCH_VER} ]] || SRC_URI="${SRC_URI}
 		https://dev.gentoo.org/~${PATCH_DEV}/distfiles/binutils-${PATCH_BINUTILS_VER}-patches-${PATCH_VER}.tar.xz"
 	SLOT=$(ver_cut 1-2)
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 fi
 
 #
@@ -273,6 +273,19 @@ src_configure() {
 		# But the check does not quite work on i686: bug #760926.
 		$(use_enable cet)
 	)
+
+	if ! is_cross ; then
+		myconf+=( $(use_enable pgo pgo-build lto) )
+
+		if use pgo ; then
+			export BUILD_CFLAGS="${CFLAGS}"
+		fi
+	fi
+
+	if use pgo && ! is_cross ; then
+		export BUILD_CFLAGS="${CFLAGS}"
+	fi
+
 	echo ./configure "${myconf[@]}"
 	"${S}"/configure "${myconf[@]}" || die
 
diff --git a/sys-devel/binutils/binutils-9999.ebuild b/sys-devel/binutils/binutils-9999.ebuild
index 2609713b2a04..9931d3fee518 100644
--- a/sys-devel/binutils/binutils-9999.ebuild
+++ b/sys-devel/binutils/binutils-9999.ebuild
@@ -8,7 +8,7 @@ inherit libtool flag-o-matic gnuconfig strip-linguas toolchain-funcs
 DESCRIPTION="Tools necessary to build programs"
 HOMEPAGE="https://sourceware.org/binutils/"
 LICENSE="GPL-3+"
-IUSE="cet default-gold doc +gold multitarget +nls +plugins static-libs test vanilla"
+IUSE="cet default-gold doc +gold multitarget +nls pgo +plugins static-libs test vanilla"
 REQUIRED_USE="default-gold? ( gold )"
 
 # Variables that can be set here  (ignored for live ebuilds)
@@ -274,6 +274,19 @@ src_configure() {
 		# But the check does not quite work on i686: bug #760926.
 		$(use_enable cet)
 	)
+
+	if ! is_cross ; then
+		myconf+=( $(use_enable pgo pgo-build lto) )
+
+		if use pgo ; then
+			export BUILD_CFLAGS="${CFLAGS}"
+		fi
+	fi
+
+	if use pgo && ! is_cross ; then
+		export BUILD_CFLAGS="${CFLAGS}"
+	fi
+
 	echo ./configure "${myconf[@]}"
 	"${S}"/configure "${myconf[@]}" || die
 
diff --git a/sys-devel/binutils/metadata.xml b/sys-devel/binutils/metadata.xml
index 4f6990c6d6f9..e05bf0bdd552 100644
--- a/sys-devel/binutils/metadata.xml
+++ b/sys-devel/binutils/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="cet">Enable Intel Control-flow Enforcement Technology.</flag>
 		<flag name="default-gold">Set ld to point to ld.gold instead of ld.bfd</flag>
 		<flag name="gold">Build ld.gold linker</flag>
+		<flag name="pgo">Build binutils with Profile Guided Optimization (PGO) and LTO</flag>
 		<flag name="plugins">Enable plugin support in tools</flag>
 		<flag name="multitarget">Adds support to binutils for cross compiling (does not work with gas)</flag>
 	</use>