From bb47e62c0884181727ecad2487c3a46d0593b238 Mon Sep 17 00:00:00 2001
From: Flatcar Buildbot <buildbot@flatcar-linux.org>
Date: Mon, 19 Jun 2023 07:15:01 +0000
Subject: [PATCH] eclass/toolchain-funcs: Sync with Gentoo

It's from Gentoo commit cab79611b07c9ebb795c6f65562ef72ba77550b1.
---
 .../portage-stable/eclass/toolchain-funcs.eclass   | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
index 63db0cfa5e..bffbf36f16 100644
--- a/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
+++ b/sdk_container/src/third_party/portage-stable/eclass/toolchain-funcs.eclass
@@ -683,16 +683,7 @@ tc-ninja_magic_to_arch() {
 		frv*)		echo frv;;
 		hexagon*)	echo hexagon;;
 		hppa*)		ninj parisc hppa;;
-		i?86*)
-			# Starting with linux-2.6.24, the 'x86_64' and 'i386'
-			# trees have been unified into 'x86'.
-			# FreeBSD still uses i386
-			if [[ ${type} == "kern" && ${host} == *freebsd* ]] ; then
-				echo i386
-			else
-				echo x86
-			fi
-			;;
+		i?86*)		echo x86;;
 		ia64*)		echo ia64;;
 		loongarch*)	ninj loongarch loong;;
 		m68*)		echo m68k;;
@@ -726,7 +717,6 @@ tc-ninja_magic_to_arch() {
 					;;
 		tile*)		echo tile;;
 		vax*)		echo vax;;
-		x86_64*freebsd*) echo amd64;;
 		x86_64*)
 			# Starting with linux-2.6.24, the 'x86_64' and 'i386'
 			# trees have been unified into 'x86'.
@@ -1077,7 +1067,7 @@ gen_usr_ldscript() {
 	case ${CTARGET:-${CHOST}} in
 	*-darwin*) ;;
 	*-android*) return 0 ;;
-	*linux*|*-freebsd*|*-openbsd*|*-netbsd*)
+	*linux*)
 		use prefix && return 0 ;;
 	*) return 0 ;;
 	esac