From 42e82780761e75f17a5cc96626558a297782f385 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 10 Jun 2023 15:51:39 +0100 Subject: gentoo auto-resync : 10:06:2023 - 15:51:39 --- eclass/toolchain-funcs.eclass | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'eclass/toolchain-funcs.eclass') diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass index 63db0cfa5e0e..bffbf36f1696 100644 --- a/eclass/toolchain-funcs.eclass +++ b/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 -- cgit v1.2.3