From 6bdec3b6af1e5b97316c2b8b6228028832a2971b Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 11 Mar 2024 07:16:48 +0000
Subject: [PATCH] sys-devel/binutils: Sync with Gentoo

It's from Gentoo commit 68466c8b5bda1cbf82e364763c42c7c9df1dfff0.
---
 .../binutils/binutils-2.32-r2.ebuild          |  4 ++
 .../binutils/binutils-2.33.1-r1.ebuild        |  4 ++
 .../binutils/binutils-2.34-r2.ebuild          |  4 ++
 .../sys-devel/binutils/binutils-2.35.2.ebuild |  4 ++
 .../binutils/binutils-2.36.1-r2.ebuild        |  4 ++
 .../binutils/binutils-2.37_p1-r2.ebuild       |  4 ++
 .../binutils/binutils-2.38-r2.ebuild          |  4 ++
 .../binutils/binutils-2.39-r5.ebuild          |  4 ++
 .../binutils/binutils-2.40-r9.ebuild          |  4 ++
 .../binutils/binutils-2.41-r2.ebuild          |  4 ++
 .../binutils/binutils-2.41-r3.ebuild          |  4 ++
 .../binutils/binutils-2.41-r4.ebuild          |  4 ++
 .../binutils/binutils-2.41-r5.ebuild          |  6 ++-
 .../binutils/binutils-2.42-r1.ebuild          | 38 ++++++++++++++++---
 .../sys-devel/binutils/binutils-9999.ebuild   | 38 ++++++++++++++++---
 15 files changed, 119 insertions(+), 11 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.ebuild
index 0fcdb18847..1603eecf56 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.32-r2.ebuild
@@ -281,6 +281,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}"
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.ebuild
index 748cab6ef9..1407f814db 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.33.1-r1.ebuild
@@ -274,6 +274,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}"
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.ebuild
index 42d6d1910d..c4bd1379cc 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.34-r2.ebuild
@@ -275,6 +275,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}"
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.ebuild
index 2dd287d2dc..9e076a637a 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.35.2.ebuild
@@ -299,6 +299,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}"
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.ebuild
index 2f20daa4bb..84cfcde9b0 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.36.1-r2.ebuild
@@ -294,6 +294,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}"
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.ebuild
index 4d35c92270..766e5f40ec 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.37_p1-r2.ebuild
@@ -313,6 +313,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}"
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.ebuild
index a9791fe4df..18e577f9b7 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.38-r2.ebuild
@@ -321,6 +321,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}"
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug 637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r5.ebuild
index c9f86dbbc0..859d8ca96b 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.39-r5.ebuild
@@ -336,6 +336,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}" || die
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug #637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r9.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r9.ebuild
index 8c60fad392..c3903df24f 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r9.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.40-r9.ebuild
@@ -348,6 +348,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}" || die
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug #637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r2.ebuild
index b00ec7113c..151aae2e4c 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r2.ebuild
@@ -366,6 +366,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}" || die
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug #637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r3.ebuild
index e391c34b95..49a29308d0 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r3.ebuild
@@ -366,6 +366,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}" || die
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug #637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r4.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r4.ebuild
index 44554f947d..20b6637387 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r4.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r4.ebuild
@@ -371,6 +371,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}" || die
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug #637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r5.ebuild
index 2ca7809134..8158e4ac75 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.41-r5.ebuild
@@ -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 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 #
@@ -371,6 +371,10 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}" || die
 
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
+
 	# bug #637066
 	filter-flags -Wall -Wreturn-type
 
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.42-r1.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.42-r1.ebuild
index b00b5196aa..a7bca7df85 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.42-r1.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-2.42-r1.ebuild
@@ -270,7 +270,7 @@ src_configure() {
 		$(use_with zstd)
 
 		# Disable modules that are in a combined binutils/gdb tree, bug #490566
-		--disable-{gdb,libdecnumber,readline,sim}
+		--disable-{gdb,gdbserver,libbacktrace,libdecnumber,readline,sim}
 		# Strip out broken static link flags: https://gcc.gnu.org/PR56750
 		--without-stage1-ldflags
 		# Change SONAME to avoid conflict across {native,cross}/binutils, binutils-libs. bug #666100
@@ -333,10 +333,20 @@ src_configure() {
 		)
 	fi
 
+	if use test || { use pgo && tc-is-lto ; } ; then
+		# -Wa,* needs to be consistent everywhere or lto-wrapper will complain
+		filter-flags '-Wa,*'
+	fi
+
 	if ! is_cross ; then
-		myconf+=( $(use_enable pgo pgo-build lto) )
+		myconf+=( $(use_enable pgo pgo-build $(tc-is-lto && echo "lto" || echo "yes")) )
 
 		if use pgo ; then
+			# We let configure handle it for us because it has to run
+			# the testsuite later on for profiling, and LTO isn't compatible
+			# with the testsuite.
+			filter-lto
+
 			export BUILD_CFLAGS="${CFLAGS}"
 		fi
 	fi
@@ -374,10 +384,28 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}" || die
 
-	# bug #637066
-	filter-flags -Wall -Wreturn-type
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
 
-	emake -k check
+	(
+		# Tests don't expect LTO
+		filter-lto
+
+		# lto-wrapper warnings which confuse tests
+		filter-flags '-Wa,*'
+
+		# bug #637066
+		filter-flags -Wall -Wreturn-type
+
+		emake -k check \
+			CFLAGS_FOR_TARGET="${CFLAGS_FOR_TARGET:-${CFLAGS}}" \
+			CXXFLAGS_FOR_TARGET="${CXXFLAGS_FOR_TARGET:-${CXXFLAGS}}" \
+			LDFLAGS_FOR_TARGET="${LDFLAGS_FOR_TARGET:-${LDFLAGS}}" \
+			CFLAGS="${CFLAGS}" \
+			CXXFLAGS="${CXXFLAGS}" \
+			LDFLAGS="${LDFLAGS}"
+	)
 }
 
 src_install() {
diff --git a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-9999.ebuild
index f7eab0eff6..9b30843ce9 100644
--- a/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-devel/binutils/binutils-9999.ebuild
@@ -270,7 +270,7 @@ src_configure() {
 		$(use_with zstd)
 
 		# Disable modules that are in a combined binutils/gdb tree, bug #490566
-		--disable-{gdb,libdecnumber,readline,sim}
+		--disable-{gdb,gdbserver,libbacktrace,libdecnumber,readline,sim}
 		# Strip out broken static link flags: https://gcc.gnu.org/PR56750
 		--without-stage1-ldflags
 		# Change SONAME to avoid conflict across {native,cross}/binutils, binutils-libs. bug #666100
@@ -333,10 +333,20 @@ src_configure() {
 		)
 	fi
 
+	if use test || { use pgo && tc-is-lto ; } ; then
+		# -Wa,* needs to be consistent everywhere or lto-wrapper will complain
+		filter-flags '-Wa,*'
+	fi
+
 	if ! is_cross ; then
-		myconf+=( $(use_enable pgo pgo-build lto) )
+		myconf+=( $(use_enable pgo pgo-build $(tc-is-lto && echo "lto" || echo "yes")) )
 
 		if use pgo ; then
+			# We let configure handle it for us because it has to run
+			# the testsuite later on for profiling, and LTO isn't compatible
+			# with the testsuite.
+			filter-lto
+
 			export BUILD_CFLAGS="${CFLAGS}"
 		fi
 	fi
@@ -374,10 +384,28 @@ src_compile() {
 src_test() {
 	cd "${MY_BUILDDIR}" || die
 
-	# bug #637066
-	filter-flags -Wall -Wreturn-type
+	# https://sourceware.org/PR31327
+	local -x XZ_OPT="-T1"
+	local -x XZ_DEFAULTS="-T1"
 
-	emake -k check
+	(
+		# Tests don't expect LTO
+		filter-lto
+
+		# lto-wrapper warnings which confuse tests
+		filter-flags '-Wa,*'
+
+		# bug #637066
+		filter-flags -Wall -Wreturn-type
+
+		emake -k check \
+			CFLAGS_FOR_TARGET="${CFLAGS_FOR_TARGET:-${CFLAGS}}" \
+			CXXFLAGS_FOR_TARGET="${CXXFLAGS_FOR_TARGET:-${CXXFLAGS}}" \
+			LDFLAGS_FOR_TARGET="${LDFLAGS_FOR_TARGET:-${LDFLAGS}}" \
+			CFLAGS="${CFLAGS}" \
+			CXXFLAGS="${CXXFLAGS}" \
+			LDFLAGS="${LDFLAGS}"
+	)
 }
 
 src_install() {