svn commit: r331963 - in head/share: examples/etc mk
Jung-uk Kim
jkim at FreeBSD.org
Tue Apr 3 23:11:09 UTC 2018
Author: jkim
Date: Tue Apr 3 23:11:08 2018
New Revision: 331963
URL: https://svnweb.freebsd.org/changeset/base/331963
Log:
Catch up with Clang 6.0.
MFC after: 3 days
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 Tue Apr 3 22:49:58 2018 (r331962)
+++ head/share/examples/etc/make.conf Tue Apr 3 23:11:08 2018 (r331963)
@@ -45,7 +45,8 @@
# 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) skylake, knl, broadwell, haswell, ivybridge,
+# (Intel CPUs) 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 Tue Apr 3 22:49:58 2018 (r331962)
+++ head/share/mk/bsd.cpu.mk Tue Apr 3 23:11:08 2018 (r331963)
@@ -199,14 +199,16 @@ MACHINE_CPU = 3dnow mmx k6 k5 i586
MACHINE_CPU = mmx k6 k5 i586
. elif ${CPUTYPE} == "k5"
MACHINE_CPU = k5 i586
-. elif ${CPUTYPE} == "skylake" || ${CPUTYPE} == "knl"
+. elif ${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} == "broadwell" || ${CPUTYPE} == "haswell"
+. elif ${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
-. elif ${CPUTYPE} == "westmere" || ${CPUTYPE} == "nehalem" || \
- ${CPUTYPE} == "silvermont"
+. elif ${CPUTYPE} == "goldmont" || ${CPUTYPE} == "westmere" || \
+ ${CPUTYPE} == "nehalem" || ${CPUTYPE} == "silvermont"
MACHINE_CPU = sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
. elif ${CPUTYPE} == "penryn"
MACHINE_CPU = sse41 ssse3 sse3 sse2 sse i686 mmx i586
@@ -260,14 +262,16 @@ MACHINE_CPU = k8 3dnow sse3
. elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
${CPUTYPE} == "athlon-fx" || ${CPUTYPE} == "k8"
MACHINE_CPU = k8 3dnow
-. elif ${CPUTYPE} == "skylake" || ${CPUTYPE} == "knl"
+. elif ${CPUTYPE} == "cannonlake" || ${CPUTYPE} == "knm" || \
+ ${CPUTYPE} == "skylake-avx512" || ${CPUTYPE} == "knl"
MACHINE_CPU = avx512 avx2 avx sse42 sse41 ssse3 sse3
-. elif ${CPUTYPE} == "broadwell" || ${CPUTYPE} == "haswell"
+. elif ${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
-. elif ${CPUTYPE} == "westmere" || ${CPUTYPE} == "nehalem" || \
- ${CPUTYPE} == "silvermont"
+. elif ${CPUTYPE} == "goldmont" || ${CPUTYPE} == "westmere" || \
+ ${CPUTYPE} == "nehalem" || ${CPUTYPE} == "silvermont"
MACHINE_CPU = sse42 sse41 ssse3 sse3
. elif ${CPUTYPE} == "penryn"
MACHINE_CPU = sse41 ssse3 sse3
More information about the svn-src-head
mailing list