From 434f008798f2ded5c2e3c0761e63c487010d3494 Mon Sep 17 00:00:00 2001 From: jkim Date: Thu, 21 Mar 2019 21:45:02 +0000 Subject: [PATCH] Catch up with Clang 8.0. --- share/examples/etc/make.conf | 6 +++--- share/mk/bsd.cpu.mk | 14 ++++++++------ 2 files changed, 11 insertions(+), 9 deletions(-) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index e827a678fab..8a9fa90ac12 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -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.) diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 0f3b8077dc5..acf1f592259 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -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" -- 2.45.0