From e754c10d23a23d8548db1a8496b5f333bfb2b376 Mon Sep 17 00:00:00 2001
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Tue, 10 Mar 2020 23:12:55 +0000
Subject: [PATCH] Add "tigerlake" CPUTYPE for x86 to catch up with Clang 10.0.

---
 share/examples/etc/make.conf | 15 ++++++++-------
 share/mk/bsd.cpu.mk          | 16 ++++++++--------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 932aa49e9c9..37b3b774c8d 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -35,13 +35,14 @@
 #			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)	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)	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 b7fd6cfdd5b..e5ac548c238 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -183,10 +183,10 @@ MACHINE_CPU = 3dnow mmx k6 k5 i586
 MACHINE_CPU = mmx k6 k5 i586
 .  elif ${CPUTYPE} == "k5"
 MACHINE_CPU = k5 i586
-.  elif ${CPUTYPE} == "cooperlake" || ${CPUTYPE} == "cascadelake" || \
-    ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \
-    ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
-    ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
+.  elif ${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"
@@ -249,10 +249,10 @@ MACHINE_CPU = k8 3dnow sse3
 .  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
     ${CPUTYPE} == "athlon-fx" || ${CPUTYPE} == "k8"
 MACHINE_CPU = k8 3dnow
-.  elif ${CPUTYPE} == "cooperlake" || ${CPUTYPE} == "cascadelake" || \
-    ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \
-    ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
-    ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
+.  elif ${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"