2 files changed, 43 insertions, 4 deletions
diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.force b/profiles/prefix/darwin/macos/arch/arm64/use.force
index 3055521d22e8..952fb5bdafa3 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/use.force
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.force
@@ -1,6 +1,25 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Force the flag corresponding to the default ABI
-x64-macos
 arm64-macos
+
+# Instruction sets that are always available on M1
+cpu_flags_arm_v4
+cpu_flags_arm_v5
+cpu_flags_arm_v6
+cpu_flags_arm_v7
+cpu_flags_arm_v8
+
+cpu_flags_arm_aes
+cpu_flags_arm_crc32
+cpu_flags_arm_neon
+cpu_flags_arm_edsp
+cpu_flags_arm_sha1
+cpu_flags_arm_sha2
+cpu_flags_arm_thumb
+cpu_flags_arm_thumb2
+cpu_flags_arm_vfp
+cpu_flags_arm_vfpv3
+cpu_flags_arm_vfpv4
+cpu_flags_arm_vfp-d32
diff --git a/profiles/prefix/darwin/macos/arch/arm64/use.mask b/profiles/prefix/darwin/macos/arch/arm64/use.mask
index 1460af56464c..2de1511d28c2 100644
--- a/profiles/prefix/darwin/macos/arch/arm64/use.mask
+++ b/profiles/prefix/darwin/macos/arch/arm64/use.mask
@@ -1,6 +1,26 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Unmask the flag corresponding to the default ABI
--x64-macos
 -arm64-macos
+
+# Unmask arm specific USE flags, M1 is v8 + custom stuff
+-cpu_flags_arm_v4
+-cpu_flags_arm_v4
+-cpu_flags_arm_v5
+-cpu_flags_arm_v6
+-cpu_flags_arm_v7
+-cpu_flags_arm_v8
+
+-cpu_flags_arm_aes
+-cpu_flags_arm_crc32
+-cpu_flags_arm_neon
+-cpu_flags_arm_edsp
+-cpu_flags_arm_sha1
+-cpu_flags_arm_sha2
+-cpu_flags_arm_thumb
+-cpu_flags_arm_thumb2
+-cpu_flags_arm_vfp
+-cpu_flags_arm_vfpv3
+-cpu_flags_arm_vfpv4
+-cpu_flags_arm_vfp-d32