From e80145525b54a90672d36c9a168d83d0c7cb8161 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Mon, 14 Jun 2021 19:06:03 -0400
Subject: [PATCH] bsd.cpu.mk: Correct MACHINE_CPU for Intel Alder Lake

Apparently Intel Alder Lake lacks AVX-512 instructions.

Fixes:		09e7341c5ea4 "Catch up with Clang 12"
---
 share/mk/bsd.cpu.mk | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index c4ca930b74e..81a1f0f0dd3 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -190,14 +190,14 @@ MACHINE_CPU = 3dnow mmx k6 k5 i586
 MACHINE_CPU = mmx k6 k5 i586
 .  elif ${CPUTYPE} == "k5"
 MACHINE_CPU = k5 i586
-.  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"
+.  elif ${CPUTYPE} == "sapphirerapids" || ${CPUTYPE} == "tigerlake" || \
+    ${CPUTYPE} == "cooperlake" || ${CPUTYPE} == "cascadelake" || \
+    ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \
+    ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
+    ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
 MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
-.  elif ${CPUTYPE} == "skylake" || ${CPUTYPE} == "broadwell" || \
-    ${CPUTYPE} == "haswell"
+.  elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "skylake" || \
+    ${CPUTYPE} == "broadwell" || ${CPUTYPE} == "haswell"
 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
@@ -258,14 +258,14 @@ MACHINE_CPU = k8 3dnow sse3
 .  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
     ${CPUTYPE} == "athlon-fx" || ${CPUTYPE} == "k8"
 MACHINE_CPU = k8 3dnow
-.  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"
+.  elif ${CPUTYPE} == "sapphirerapids" || ${CPUTYPE} == "tigerlake" || \
+    ${CPUTYPE} == "cooperlake" || ${CPUTYPE} == "cascadelake" || \
+    ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \
+    ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
+    ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
 MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3
-.  elif ${CPUTYPE} == "skylake" || ${CPUTYPE} == "broadwell" || \
-    ${CPUTYPE} == "haswell"
+.  elif ${CPUTYPE} == "alderlake" || ${CPUTYPE} == "skylake" || \
+    ${CPUTYPE} == "broadwell" || ${CPUTYPE} == "haswell"
 MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "ivybridge" || ${CPUTYPE} == "sandybridge"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse3