profiles/arch: Add use.force/.mask entries for CPU_FLAGS_ARM

diff --git a/profiles/arch/arm/armv5te/use.force b/profiles/arch/arm/armv5te/use.force
new file mode 100644 (file)
index 0000000..a26ab04
--- /dev/null
+++ b/profiles/arch/arm/armv5te/use.force
@@ -0,0 +1,6 @@
+# Force armv5 specific USE flags
+cpu_flags_arm_v4
+cpu_flags_arm_v5
+
+cpu_flags_arm_edsp
+cpu_flags_arm_thumb

diff --git a/profiles/arch/arm/armv5te/use.mask b/profiles/arch/arm/armv5te/use.mask
index 820df240882c0b317d7deb79b801d738bbc62804..ac64860e2facf2552bcd8d7015265300f708d3b7 100644 (file)
--- a/profiles/arch/arm/armv5te/use.mask
+++ b/profiles/arch/arm/armv5te/use.mask
@@ -1,2 +1,9 @@
 # Unmask armv5 specific USE flags
 -armv5te
+
+-cpu_flags_arm_v4
+-cpu_flags_arm_v5
+
+-cpu_flags_arm_edsp
+-cpu_flags_arm_thumb
+-cpu_flags_arm_vfp

diff --git a/profiles/arch/arm/armv6j/use.force b/profiles/arch/arm/armv6j/use.force
new file mode 100644 (file)
index 0000000..e5abb15
--- /dev/null
+++ b/profiles/arch/arm/armv6j/use.force
@@ -0,0 +1,7 @@
+# Force armv6 specific USE flags
+cpu_flags_arm_v4
+cpu_flags_arm_v5
+cpu_flags_arm_v6
+
+cpu_flags_arm_edsp
+cpu_flags_arm_thumb

diff --git a/profiles/arch/arm/armv6j/use.mask b/profiles/arch/arm/armv6j/use.mask
index a29ab8d8f85091edb13abac14b3e7f14922d866f..14b9b73775a9e0f4f62c12c718ae1fe4f6dc7316 100644 (file)
--- a/profiles/arch/arm/armv6j/use.mask
+++ b/profiles/arch/arm/armv6j/use.mask
@@ -2,3 +2,11 @@
 -armvfp
 -armv6
 -armv6t2
+
+-cpu_flags_arm_v4
+-cpu_flags_arm_v5
+-cpu_flags_arm_v6
+
+-cpu_flags_arm_edsp
+-cpu_flags_arm_thumb
+-cpu_flags_arm_vfp

diff --git a/profiles/arch/arm/armv7a/use.force b/profiles/arch/arm/armv7a/use.force
index dd1d1c7a1ecfd220e4789d2097cb1354ff01048f..a2d86cc89d0a0eb3bba943c79424ee2f90dffcbb 100644 (file)
--- a/profiles/arch/arm/armv7a/use.force
+++ b/profiles/arch/arm/armv7a/use.force
@@ -2,3 +2,13 @@
 armv5te
 armv6
 armv6t2
+
+cpu_flags_arm_v4
+cpu_flags_arm_v5
+cpu_flags_arm_v6
+cpu_flags_arm_v7
+
+cpu_flags_arm_edsp
+cpu_flags_arm_thumb
+cpu_flags_arm_thumb2
+cpu_flags_arm_vfp

diff --git a/profiles/arch/arm/armv7a/use.mask b/profiles/arch/arm/armv7a/use.mask
index ff06e5bbabdecf1c1e50a6d24ef3e156cd52a091..943381017df62c58ddef9031d53ba1d780b47d65 100644 (file)
--- a/profiles/arch/arm/armv7a/use.mask
+++ b/profiles/arch/arm/armv7a/use.mask
@@ -4,3 +4,17 @@
 -armv5te
 -armv6
 -armv6t2
+
+-cpu_flags_arm_v4
+-cpu_flags_arm_v5
+-cpu_flags_arm_v6
+-cpu_flags_arm_v7
+
+-cpu_flags_arm_edsp
+-cpu_flags_arm_neon
+-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/arch/arm/use.mask b/profiles/arch/arm/use.mask
index 95fe9a97a03a391a28d457e440d42d5d7e99d134..6d6ff1cc2c0b0ac6c50625094b05578505637958 100644 (file)
--- a/profiles/arch/arm/use.mask
+++ b/profiles/arch/arm/use.mask
@@ -2,6 +2,7 @@
 -arm
 
 # Unmask arm arch specific flags
+-cpu_flags_arm_iwmmxt
 -iwmmxt
 
 # Patrick Lauer <patrick@gentoo.org> (28 Apr 2015)

diff --git a/profiles/arch/arm64/use.force b/profiles/arch/arm64/use.force
index 0418ed743a949322a2d2e1d40b938ce051d1406e..ad4cb1b4c759f1dc0189ae205088ac1666ad6e62 100644 (file)
--- a/profiles/arch/arm64/use.force
+++ b/profiles/arch/arm64/use.force
@@ -1,2 +1,18 @@
 # Force the flag which corresponds to ARCH.
 arm64
+
+# Instruction sets that are always available
+cpu_flags_arm_v4
+cpu_flags_arm_v5
+cpu_flags_arm_v6
+cpu_flags_arm_v7
+cpu_flags_arm_v8
+
+cpu_flags_arm_edsp
+cpu_flags_arm_neon
+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/arch/arm64/use.mask b/profiles/arch/arm64/use.mask
index c618b135870245894badcf4c86e1f2bc7e6d5da7..0176eeb01b4a4c17a7701a72e59bea4572cf2619 100644 (file)
--- a/profiles/arch/arm64/use.mask
+++ b/profiles/arch/arm64/use.mask
@@ -2,6 +2,27 @@
 -arm64
 
 # Unmask arm specific USE flags
+-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_edsp
+-cpu_flags_arm_neon
+-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
+
+# Unmask [old] arm specific USE flags
 -neon
 -armvfp
 

diff --git a/profiles/arch/base/use.mask b/profiles/arch/base/use.mask
index 73148698c4295da69e172183c6763d933d621dd4..f8048c887f4d6e1a6b2481eb747b67731a6ba039 100644 (file)
--- a/profiles/arch/base/use.mask
+++ b/profiles/arch/base/use.mask
@@ -76,6 +76,26 @@ ps3
 vis
 
 # arm arch specific USE flags
+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_edsp
+cpu_flags_arm_iwmmxt
+cpu_flags_arm_neon
+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
+
+# [old] arm arch specific USE flags
 armvfp
 armv5te
 armv6