svn commit: r345388 - in head/share: examples/etc mk

[Jung-uk Kim]

Author: jkim
Date: Thu Mar 21 21:45:02 2019
New Revision: 345388
URL: https://svnweb.freebsd.org/changeset/base/345388

Log:
  Catch up with Clang 8.0.

Modified:
  head/share/examples/etc/make.conf
  head/share/mk/bsd.cpu.mk

Modified: head/share/examples/etc/make.conf
==============================================================================
--- head/share/examples/etc/make.conf	Thu Mar 21 21:43:23 2019	(r345387)
+++ head/share/examples/etc/make.conf	Thu Mar 21 21:45:02 2019	(r345388)
@@ -45,9 +45,9 @@
 # Additionally the following CPU types are recognized by clang:
 #   Intel x86 architecture (for both amd64 and i386):
 #       (AMD CPUs)	znver1, bdver4, bdver3, bdver2, bdver1, btver2, btver1
-#       (Intel CPUs)	tremont, goldmont-plus, icelake-server, icelake-client,
-#			cannonlake, knm, skylake-avx512, knl, goldmont,
-#			skylake, broadwell, haswell, ivybridge,
+#       (Intel CPUs)	cascadelake, tremont, goldmont-plus, icelake-server,
+#			icelake-client, cannonlake, knm, skylake-avx512, knl,
+#			goldmont, skylake, broadwell, haswell, ivybridge,
 #			sandybridge, westmere, nehalem, silvermont, bonnell
 #
 # (?= allows to buildworld for a different CPUTYPE.)

Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk	Thu Mar 21 21:43:23 2019	(r345387)
+++ head/share/mk/bsd.cpu.mk	Thu Mar 21 21:45:02 2019	(r345388)
@@ -201,9 +201,10 @@ MACHINE_CPU = 3dnow mmx k6 k5 i586
 MACHINE_CPU = mmx k6 k5 i586
 .  elif ${CPUTYPE} == "k5"
 MACHINE_CPU = k5 i586
-.  elif ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \
-    ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
-    ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
+.  elif ${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"
@@ -266,9 +267,10 @@ MACHINE_CPU = k8 3dnow sse3
 .  elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
     ${CPUTYPE} == "athlon-fx" || ${CPUTYPE} == "k8"
 MACHINE_CPU = k8 3dnow
-.  elif ${CPUTYPE} == "icelake-server" || ${CPUTYPE} == "icelake-client" || \
-    ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
-    ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
+.  elif ${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"