svn commit: r356567 - in head/share: examples/etc mk
Jung-uk Kim
jkim at FreeBSD.org
Thu Jan 9 20:07:39 UTC 2020
Author: jkim
Date: Thu Jan 9 20:07:38 2020
New Revision: 356567
URL: https://svnweb.freebsd.org/changeset/base/356567
Log:
Catch up with Clang 9.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 Jan 9 19:58:05 2020 (r356566)
+++ head/share/examples/etc/make.conf Thu Jan 9 20:07:38 2020 (r356567)
@@ -44,11 +44,13 @@
# if omitted), ultrasparc3
# 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) cascadelake, tremont, goldmont-plus, icelake-server,
-# icelake-client, cannonlake, knm, skylake-avx512, knl,
-# goldmont, skylake, broadwell, haswell, ivybridge,
-# sandybridge, westmere, nehalem, silvermont, bonnell
+# (AMD CPUs) znver2, znver1, bdver4, bdver3, bdver2, bdver1,
+# btver2, btver1
+# (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
# ARM architecture: armv5, armv5te, armv6, armv6t2, arm1176jzf-s, armv7,
# armv7-a, armv7ve, generic-armv7-a, cortex-a5,
# cortex-a7, cortex-a8, cortex-a9, cortex-a12,
Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk Thu Jan 9 19:58:05 2020 (r356566)
+++ head/share/mk/bsd.cpu.mk Thu Jan 9 20:07:38 2020 (r356567)
@@ -170,7 +170,7 @@ _CPUCFLAGS = -mcpu=${CPUTYPE}
########## i386
. if ${MACHINE_CPUARCH} == "i386"
-. if ${CPUTYPE} == "znver1"
+. if ${CPUTYPE} == "znver2" || ${CPUTYPE} == "znver1"
MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
. elif ${CPUTYPE} == "bdver4"
MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
@@ -199,10 +199,10 @@ MACHINE_CPU = 3dnow mmx k6 k5 i586
MACHINE_CPU = mmx k6 k5 i586
. elif ${CPUTYPE} == "k5"
MACHINE_CPU = k5 i586
-. elif ${CPUTYPE} == "cascadelake" || ${CPUTYPE} == "icelake-server" || \
- ${CPUTYPE} == "icelake-client" || ${CPUTYPE} == "cannonlake" || \
- ${CPUTYPE} == "knm" || ${CPUTYPE} == "skylake-avx512" || \
- ${CPUTYPE} == "knl"
+. elif ${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"
@@ -246,7 +246,7 @@ MACHINE_CPU = mmx
MACHINE_CPU += i486
########## amd64
. elif ${MACHINE_CPUARCH} == "amd64"
-. if ${CPUTYPE} == "znver1"
+. if ${CPUTYPE} == "znver2" || ${CPUTYPE} == "znver1"
MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3
. elif ${CPUTYPE} == "bdver4"
MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3
@@ -265,10 +265,10 @@ MACHINE_CPU = k8 3dnow sse3
. elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
${CPUTYPE} == "athlon-fx" || ${CPUTYPE} == "k8"
MACHINE_CPU = k8 3dnow
-. elif ${CPUTYPE} == "cascadelake" || ${CPUTYPE} == "icelake-server" || \
- ${CPUTYPE} == "icelake-client" || ${CPUTYPE} == "cannonlake" || \
- ${CPUTYPE} == "knm" || ${CPUTYPE} == "skylake-avx512" || \
- ${CPUTYPE} == "knl"
+. elif ${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"
More information about the svn-src-all
mailing list