git: ce159ac62d6c - stable/13 - bsd.cpu.mk: add support for x86-64-v[234] levels as CPUTYPE

The branch stable/13 has been updated by dim:

URL: https://cgit.FreeBSD.org/src/commit/?id=ce159ac62d6c8761fdbe43bfef601f0a85209a29

commit ce159ac62d6c8761fdbe43bfef601f0a85209a29
Author:     Val Packett <val@packett.cool>
AuthorDate: 2021-08-06 13:33:37 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-04-21 19:02:08 +0000

    bsd.cpu.mk: add support for x86-64-v[234] levels as CPUTYPE
    
    These are supported in LLVM 12 and GCC 11:
    
    https://github.com/llvm/llvm-project/commit/012dd42e027e
    https://gcc.gnu.org/git/?p=gcc.git;a=commit;h=324bec558e95584e8c1997575ae9d75978af59f1
    
    Differential Revision:  https://reviews.freebsd.org/D29150
    
    (cherry picked from commit 362fef2f4a9954c0f5eeecbe512cc5abbdc44263)
---
 share/mk/bsd.cpu.mk | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 08b98e824492..67d817e11101 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -193,16 +193,19 @@ MACHINE_CPU = k5 i586
     ${CPUTYPE} == "cooperlake" || ${CPUTYPE} == "cascadelake" || \
     ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \
     ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
-    ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
+    ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl" || \
+    ${CPUTYPE} == "x86-64-v4"
 MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "skylake" || \
-    ${CPUTYPE} == "broadwell" || ${CPUTYPE} == "haswell"
+    ${CPUTYPE} == "broadwell" || ${CPUTYPE} == "haswell" || \
+    ${CPUTYPE} == "x86-64-v3"
 MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "ivybridge" || ${CPUTYPE} == "sandybridge"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "tremont" || ${CPUTYPE} == "goldmont-plus" || \
     ${CPUTYPE} == "goldmont" || ${CPUTYPE} == "westmere" || \
-    ${CPUTYPE} == "nehalem" || ${CPUTYPE} == "silvermont"
+    ${CPUTYPE} == "nehalem" || ${CPUTYPE} == "silvermont" || \
+    ${CPUTYPE} == "x86-64-v2"
 MACHINE_CPU = sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "penryn"
 MACHINE_CPU = sse41 ssse3 sse3 sse2 sse i686 mmx i586
@@ -211,7 +214,7 @@ MACHINE_CPU = ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "yonah" || ${CPUTYPE} == "prescott"
 MACHINE_CPU = sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || \
-    ${CPUTYPE} == "pentium-m"
+    ${CPUTYPE} == "pentium-m" || ${CPUTYPE} == "x86-64"
 MACHINE_CPU = sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "pentium3" || ${CPUTYPE} == "pentium3m"
 MACHINE_CPU = sse i686 mmx i586
@@ -261,16 +264,19 @@ MACHINE_CPU = k8 3dnow
     ${CPUTYPE} == "cooperlake" || ${CPUTYPE} == "cascadelake" || \
     ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \
     ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
-    ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
+    ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl" || \
+    ${CPUTYPE} == "x86-64-v4"
 MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "skylake" || \
-    ${CPUTYPE} == "broadwell" || ${CPUTYPE} == "haswell"
+    ${CPUTYPE} == "broadwell" || ${CPUTYPE} == "haswell" || \
+    ${CPUTYPE} == "x86-64-v3"
 MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "ivybridge" || ${CPUTYPE} == "sandybridge"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "tremont" || ${CPUTYPE} == "goldmont-plus" || \
     ${CPUTYPE} == "goldmont" || ${CPUTYPE} == "westmere" || \
-    ${CPUTYPE} == "nehalem" || ${CPUTYPE} == "silvermont"
+    ${CPUTYPE} == "nehalem" || ${CPUTYPE} == "silvermont" || \
+    ${CPUTYPE} == "x86-64-v2"
 MACHINE_CPU = sse42 sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "penryn"
 MACHINE_CPU = sse41 ssse3 sse3