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

[Jung-uk Kim]

Author: jkim
Date: Tue Mar  7 19:00:27 2017
New Revision: 314875
URL: https://svnweb.freebsd.org/changeset/base/314875

Log:
  Catch up with Clang 4.0.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	Tue Mar  7 18:31:03 2017	(r314874)
+++ head/share/examples/etc/make.conf	Tue Mar  7 19:00:27 2017	(r314875)
@@ -44,7 +44,7 @@
 #				if omitted), ultrasparc3
 # Additionally the following CPU types are recognized by clang:
 #   Intel x86 architecture (for both amd64 and i386):
-#       (AMD CPUs)	bdver4, bdver3, bdver2, bdver1, btver2, btver1
+#       (AMD CPUs)	znver1, bdver4, bdver3, bdver2, bdver1, btver2, btver1
 #       (Intel CPUs)	skylake, knl, broadwell, haswell, ivybridge,
 #			sandybridge, westmere, nehalem, silvermont, bonnell
 #

Modified: head/share/mk/bsd.cpu.mk
==============================================================================
--- head/share/mk/bsd.cpu.mk	Tue Mar  7 18:31:03 2017	(r314874)
+++ head/share/mk/bsd.cpu.mk	Tue Mar  7 19:00:27 2017	(r314875)
@@ -173,7 +173,9 @@ _CPUCFLAGS = -mcpu=${CPUTYPE}
 
 ########## i386
 . if ${MACHINE_CPUARCH} == "i386"
-.  if ${CPUTYPE} == "bdver4"
+.  if ${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
 .  elif ${CPUTYPE} == "bdver3" || ${CPUTYPE} == "bdver2" || \
     ${CPUTYPE} == "bdver1"
@@ -242,7 +244,9 @@ MACHINE_CPU = mmx
 MACHINE_CPU += i486
 ########## amd64
 . elif ${MACHINE_CPUARCH} == "amd64"
-.  if ${CPUTYPE} == "bdver4"
+.  if ${CPUTYPE} == "znver1"
+MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse4a sse3
+.  elif ${CPUTYPE} == "bdver4"
 MACHINE_CPU = xop avx2 avx sse42 sse41 ssse3 sse4a sse3
 .  elif ${CPUTYPE} == "bdver3" || ${CPUTYPE} == "bdver2" || \
     ${CPUTYPE} == "bdver1"