From bb20ada40d1a783fa20c4c976e4e3d24f30ea796 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Fri, 19 Dec 2025 11:05:50 +0100 Subject: [PATCH] profiles: drop x86-macos keyword 32-bits Intel-based machines are no longer supported for a while now, and all hardware ever made could also run 64-bits mode. The keywords were already dropped before, drop the existence of the keyword now too. Signed-off-by: Fabian Groffen --- profiles/arch.list | 1 - profiles/arches.desc | 1 - profiles/prefix/darwin/macos/arch/x86/eapi | 1 - .../prefix/darwin/macos/arch/x86/make.defaults | 16 ---------------- .../prefix/darwin/macos/arch/x86/package.mask | 5 ----- .../darwin/macos/arch/x86/package.use.force | 3 --- profiles/prefix/darwin/macos/arch/x86/use.force | 6 ------ profiles/prefix/darwin/macos/arch/x86/use.mask | 6 ------ 8 files changed, 39 deletions(-) delete mode 100644 profiles/prefix/darwin/macos/arch/x86/eapi delete mode 100644 profiles/prefix/darwin/macos/arch/x86/make.defaults delete mode 100644 profiles/prefix/darwin/macos/arch/x86/package.mask delete mode 100644 profiles/prefix/darwin/macos/arch/x86/package.use.force delete mode 100644 profiles/prefix/darwin/macos/arch/x86/use.force delete mode 100644 profiles/prefix/darwin/macos/arch/x86/use.mask diff --git a/profiles/arch.list b/profiles/arch.list index 3f007da08d96..e693088edd75 100644 --- a/profiles/arch.list +++ b/profiles/arch.list @@ -15,6 +15,5 @@ x86 # Prefix keywords arm64-macos -x86-macos x64-macos x64-solaris diff --git a/profiles/arches.desc b/profiles/arches.desc index 46c7271c6fd8..056b77ee086f 100644 --- a/profiles/arches.desc +++ b/profiles/arches.desc @@ -28,7 +28,6 @@ x86 stable # Prefix keywords arm64-macos testing -x86-macos testing x64-macos testing x64-solaris testing diff --git a/profiles/prefix/darwin/macos/arch/x86/eapi b/profiles/prefix/darwin/macos/arch/x86/eapi deleted file mode 100644 index 7ed6ff82de6b..000000000000 --- a/profiles/prefix/darwin/macos/arch/x86/eapi +++ /dev/null @@ -1 +0,0 @@ -5 diff --git a/profiles/prefix/darwin/macos/arch/x86/make.defaults b/profiles/prefix/darwin/macos/arch/x86/make.defaults deleted file mode 100644 index 5fd08b523f6e..000000000000 --- a/profiles/prefix/darwin/macos/arch/x86/make.defaults +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -ARCH="x86-macos" -ACCEPT_KEYWORDS="~x86-macos" - -CPU_FLAGS_X86="mmx mmxext sse sse2" - -# multilib build stuff, single ABI (no multilib) -MULTILIB_ABIS="x86" -DEFAULT_ABI="x86" -ABI="x86" -IUSE_IMPLICIT="abi_x86_32" -LIBDIR_x86="lib" -# figure out automatically what is the best to use -CFLAGS="-march=native" diff --git a/profiles/prefix/darwin/macos/arch/x86/package.mask b/profiles/prefix/darwin/macos/arch/x86/package.mask deleted file mode 100644 index 5930472f1b1c..000000000000 --- a/profiles/prefix/darwin/macos/arch/x86/package.mask +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# All the Mac OS X profiles inherit from their matching arch profile here. - diff --git a/profiles/prefix/darwin/macos/arch/x86/package.use.force b/profiles/prefix/darwin/macos/arch/x86/package.use.force deleted file mode 100644 index 9ded76ad8abd..000000000000 --- a/profiles/prefix/darwin/macos/arch/x86/package.use.force +++ /dev/null @@ -1,3 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - diff --git a/profiles/prefix/darwin/macos/arch/x86/use.force b/profiles/prefix/darwin/macos/arch/x86/use.force deleted file mode 100644 index abc39335ace6..000000000000 --- a/profiles/prefix/darwin/macos/arch/x86/use.force +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Force the flag corresponding to the default ABI -x86-macos -abi_x86_32 diff --git a/profiles/prefix/darwin/macos/arch/x86/use.mask b/profiles/prefix/darwin/macos/arch/x86/use.mask deleted file mode 100644 index e2603bddf883..000000000000 --- a/profiles/prefix/darwin/macos/arch/x86/use.mask +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -# Unmask the flag corresponding to the default ABI --x86-macos --abi_x86_32