diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
index 844737990f..952c057bfa 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.34-r2.ebuild
@@ -54,6 +54,9 @@ pkgversion() {
 }
 
 multilib_src_configure() {
+	# https://sourceware.org/PR32372
+	append-cflags -std=gnu17
+
 	filter-lto
 
 	local myconf=(
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
index d9a5e70a91..c4443d6f5e 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.35.2.ebuild
@@ -56,6 +56,9 @@ pkgversion() {
 }
 
 multilib_src_configure() {
+	# https://sourceware.org/PR32372
+	append-cflags -std=gnu17
+
 	filter-lto
 
 	local myconf=(
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild
index 3e2319ca78..ed7215c3e3 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.36.1-r2.ebuild
@@ -54,6 +54,9 @@ pkgversion() {
 }
 
 multilib_src_configure() {
+	# https://sourceware.org/PR32372
+	append-cflags -std=gnu17
+
 	filter-lto
 
 	local myconf=(
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.37_p1-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.37_p1-r2.ebuild
index 80a2ccfbaf..2434f02290 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.37_p1-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.37_p1-r2.ebuild
@@ -55,6 +55,9 @@ pkgversion() {
 }
 
 multilib_src_configure() {
+	# https://sourceware.org/PR32372
+	append-cflags -std=gnu17
+
 	filter-lto
 
 	local myconf=(
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild
index 64d59c99a5..95b5e398f8 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.38-r2.ebuild
@@ -69,6 +69,9 @@ pkgversion() {
 }
 
 multilib_src_configure() {
+	# https://sourceware.org/PR32372
+	append-cflags -std=gnu17
+
 	filter-lto
 
 	local myconf=(
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild
index 6e0753ca21..143416d9fb 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.39-r5.ebuild
@@ -69,6 +69,9 @@ pkgversion() {
 }
 
 multilib_src_configure() {
+	# https://sourceware.org/PR32372
+	append-cflags -std=gnu17
+
 	filter-lto
 
 	local myconf=(
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild
index f57205fd73..9fd6d71b33 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.40-r7.ebuild
@@ -73,6 +73,9 @@ pkgversion() {
 }
 
 multilib_src_configure() {
+	# https://sourceware.org/PR32372
+	append-cflags -std=gnu17
+
 	filter-lto
 
 	local myconf=(
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r5.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r5.ebuild
index f298f4f1f5..a757199591 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r5.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.41-r5.ebuild
@@ -75,6 +75,9 @@ pkgversion() {
 }
 
 multilib_src_configure() {
+	# https://sourceware.org/PR32372
+	append-cflags -std=gnu17
+
 	filter-lto
 
 	local myconf=(
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.42-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.42-r2.ebuild
index c49fead1d7..a24ffb5246 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.42-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.42-r2.ebuild
@@ -75,6 +75,9 @@ pkgversion() {
 }
 
 multilib_src_configure() {
+	# https://sourceware.org/PR32372
+	append-cflags -std=gnu17
+
 	filter-lto
 
 	# Workaround for lld-17 (bug #914640)
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.43-r2.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.43-r2.ebuild
index 9bb3ae91ac..bd0b6b20c1 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.43-r2.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.43-r2.ebuild
@@ -80,11 +80,10 @@ pkgversion() {
 }
 
 multilib_src_configure() {
-	filter-lto
+	# https://sourceware.org/PR32372
+	append-cflags -std=gnu17
 
-	# Workaround for lld-17 (bug #914640)
-	# Should be able to drop this w/ >=binutils-2.43
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+	filter-lto
 
 	local myconf=(
 		# portage's econf() does not detect presence of --d-d-t
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.43-r3.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.43-r3.ebuild
index b0746db92b..fd43efffc9 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.43-r3.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-2.43-r3.ebuild
@@ -80,11 +80,10 @@ pkgversion() {
 }
 
 multilib_src_configure() {
-	filter-lto
+	# https://sourceware.org/PR32372
+	append-cflags -std=gnu17
 
-	# Workaround for lld-17 (bug #914640)
-	# Should be able to drop this w/ >=binutils-2.43
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
+	filter-lto
 
 	local myconf=(
 		# portage's econf() does not detect presence of --d-d-t
diff --git a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-9999.ebuild b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-9999.ebuild
index dd6e1b4c73..fa2530d553 100644
--- a/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-9999.ebuild
+++ b/sdk_container/src/third_party/portage-stable/sys-libs/binutils-libs/binutils-libs-9999.ebuild
@@ -127,10 +127,6 @@ pkgversion() {
 multilib_src_configure() {
 	filter-lto
 
-	# Workaround for lld-17 (bug #914640)
-	# Should be able to drop this w/ >=binutils-2.43
-	append-ldflags $(test-flags-CCLD -Wl,--undefined-version)
-
 	local myconf=(
 		# portage's econf() does not detect presence of --d-d-t
 		# because it greps only top-level ./configure. But not