git: 562855795e7f - stable/13 - Catch up with Clang 12.

The branch stable/13 has been updated by dim:

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

commit 562855795e7f5b31e9a361dcd7f9f191cb5fb23f
Author:     Jung-uk Kim <jkim@FreeBSD.org>
AuthorDate: 2021-06-14 22:42:59 +0000
Commit:     Dimitry Andric <dim@FreeBSD.org>
CommitDate: 2024-04-21 19:02:07 +0000

    Catch up with Clang 12.
    
    Add "znver3" for AMD and "alderlake" and "sapphirerapids" for Intel.
    
    (cherry picked from commit 09e7341c5ea40120bd1850c48c44bfbae5475f3f)
---
 share/examples/etc/make.conf | 18 +++++++++---------
 share/mk/bsd.cpu.mk          | 12 ++++++++----
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 6bc14d5be10f..9c3bb4d19442 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -29,19 +29,19 @@
 # NO_CPU_CFLAGS variable below.
 # Currently the following CPU types are recognized:
 #   Intel x86 architecture:
-#       (AMD CPUs)	znver2, znver1, bdver4, bdver3, bdver2, bdver1,
+#       (AMD CPUs)	znver3, znver2, znver1, bdver4, bdver3, bdver2, bdver1,
 #			btver2, btver1, amdfam10, opteron-sse3, athlon64-sse3,
 #			k8-sse3, opteron, athlon64, athlon-fx, k8, athlon-mp,
 #			athlon-xp, athlon-4, athlon-tbird, athlon, k7, geode,
 #			k6-3, k6-2, k6
-#       (Intel CPUs)	tigerlake, cooperlake, cascadelake, tremont,
-#			goldmont-plus, icelake-server, icelake-client,
-#			cannonlake, knm, skylake-avx512, knl, goldmont,
-#			skylake, broadwell, haswell, ivybridge, sandybridge,
-#			westmere, nehalem, silvermont, bonnell, core2, core,
-#			nocona, pentium4m, pentium4, prescott, pentium3m,
-#			pentium3, pentium-m, pentium2, pentiumpro, pentium-mmx,
-#			pentium, i486
+#       (Intel CPUs)	alderlake, sapphirerapids, tigerlake, cooperlake,
+#			cascadelake, tremont, goldmont-plus, icelake-server,
+#			icelake-client, cannonlake, knm, skylake-avx512, knl,
+#			goldmont, skylake, broadwell, haswell, ivybridge,
+#			sandybridge, westmere, nehalem, silvermont, bonnell,
+#			core2, core, nocona, pentium4m, pentium4, prescott,
+#			pentium3m, pentium3, pentium-m, pentium2, pentiumpro,
+#			pentium-mmx, pentium, i486
 #       (VIA CPUs)	c7, c3-2, c3
 #   ARM architecture:	armv5, armv5te, armv6, armv6t2, arm1176jzf-s, armv7,
 #			armv7-a, armv7ve, generic-armv7-a, cortex-a5,
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 2e35501c4126..51f9547c399f 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -159,7 +159,8 @@ _CPUCFLAGS = -mcpu=${CPUTYPE}
 
 ########## i386
 . if ${MACHINE_CPUARCH} == "i386"
-.  if ${CPUTYPE} == "znver2" || ${CPUTYPE} == "znver1"
+.  if ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \
+    ${CPUTYPE} == "znver1"
 MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "bdver4"
 MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
@@ -188,7 +189,8 @@ MACHINE_CPU = 3dnow mmx k6 k5 i586
 MACHINE_CPU = mmx k6 k5 i586
 .  elif ${CPUTYPE} == "k5"
 MACHINE_CPU = k5 i586
-.  elif ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \
+.  elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "sapphirerapids" || \
+    ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \
     ${CPUTYPE} == "cascadelake" || ${CPUTYPE} == "icelake-server" || \
     ${CPUTYPE} == "icelake-client" || ${CPUTYPE} == "cannonlake" || \
     ${CPUTYPE} == "knm" || ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
@@ -235,7 +237,8 @@ MACHINE_CPU = mmx
 MACHINE_CPU += i486
 ########## amd64
 . elif ${MACHINE_CPUARCH} == "amd64"
-.  if ${CPUTYPE} == "znver2" || ${CPUTYPE} == "znver1"
+.  if ${CPUTYPE} == "znver3" || ${CPUTYPE} == "znver2" || \
+    ${CPUTYPE} == "znver1"
 MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3
 .  elif ${CPUTYPE} == "bdver4"
 MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3
@@ -254,7 +257,8 @@ MACHINE_CPU = k8 3dnow sse3
 .  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
     ${CPUTYPE} == "athlon-fx" || ${CPUTYPE} == "k8"
 MACHINE_CPU = k8 3dnow
-.  elif ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \
+.  elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "sapphirerapids" || \
+    ${CPUTYPE} == "tigerlake" || ${CPUTYPE} == "cooperlake" || \
     ${CPUTYPE} == "cascadelake" || ${CPUTYPE} == "icelake-server" || \
     ${CPUTYPE} == "icelake-client" || ${CPUTYPE} == "cannonlake" || \
     ${CPUTYPE} == "knm" || ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"