svn commit: r263882 - in stable/10/share: examples/etc mk

[Jung-uk Kim]

Author: jkim
Date: Fri Mar 28 20:12:30 2014
New Revision: 263882
URL: http://svnweb.freebsd.org/changeset/base/263882

Log:
  MFC:	r263435
  
  Add new CPUTYPEs supported by Clang 3.4.

Modified:
  stable/10/share/examples/etc/make.conf
  stable/10/share/mk/bsd.cpu.mk
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/share/examples/etc/make.conf
==============================================================================
--- stable/10/share/examples/etc/make.conf	Fri Mar 28 16:31:12 2014	(r263881)
+++ stable/10/share/examples/etc/make.conf	Fri Mar 28 20:12:30 2014	(r263882)
@@ -45,8 +45,8 @@
 #				if omitted), ultrasparc3
 # Additionally the following CPU types are recognized by clang:
 #   Intel x86 architecture (for both amd64 and i386):
-#       (AMD CPUs)	bdver2, bdver1, btver2, btver1
-#       (Intel CPUs)	core-avx2, core-avx-i, corei7-avx, corei7, atom
+#       (AMD CPUs)	bdver3, bdver2, bdver1, btver2, btver1
+#       (Intel CPUs)	slm, core-avx2, core-avx-i, corei7-avx, corei7, atom
 #
 # (?= allows to buildworld for a different CPUTYPE.)
 #

Modified: stable/10/share/mk/bsd.cpu.mk
==============================================================================
--- stable/10/share/mk/bsd.cpu.mk	Fri Mar 28 16:31:12 2014	(r263881)
+++ stable/10/share/mk/bsd.cpu.mk	Fri Mar 28 20:12:30 2014	(r263882)
@@ -142,7 +142,8 @@ _CPUCFLAGS = -mcpu=ultrasparc3
 # presence of a CPU feature.
 
 . if ${MACHINE_CPUARCH} == "i386"
-.  if ${CPUTYPE} == "bdver2" || ${CPUTYPE} == "bdver1"
+.  if ${CPUTYPE} == "bdver3" || ${CPUTYPE} == "bdver2" || \
+    ${CPUTYPE} == "bdver1"
 MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
 .  elif ${CPUTYPE} == "btver2"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse4a sse3 sse2 sse mmx k6 k5 i586
@@ -170,7 +171,7 @@ MACHINE_CPU = k5 i586
 MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "core-avx-i" || ${CPUTYPE} == "corei7-avx"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
-.  elif ${CPUTYPE} == "corei7"
+.  elif ${CPUTYPE} == "slm" || ${CPUTYPE} == "corei7"
 MACHINE_CPU = sse42 sse41 ssse3 sse3 sse2 sse i686 mmx i586
 .  elif ${CPUTYPE} == "penryn"
 MACHINE_CPU = sse41 ssse3 sse3 sse2 sse i686 mmx i586
@@ -204,7 +205,8 @@ MACHINE_CPU = mmx
 .  endif
 MACHINE_CPU += i486
 . elif ${MACHINE_CPUARCH} == "amd64"
-.  if ${CPUTYPE} == "bdver2" || ${CPUTYPE} == "bdver1"
+.  if ${CPUTYPE} == "bdver3" || ${CPUTYPE} == "bdver2" || \
+    ${CPUTYPE} == "bdver1"
 MACHINE_CPU = xop avx sse42 sse41 ssse3 sse4a sse3
 .  elif ${CPUTYPE} == "btver2"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse4a sse3
@@ -222,7 +224,7 @@ MACHINE_CPU = k8 3dnow
 MACHINE_CPU = avx2 avx sse42 sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "core-avx-i" || ${CPUTYPE} == "corei7-avx"
 MACHINE_CPU = avx sse42 sse41 ssse3 sse3
-.  elif ${CPUTYPE} == "corei7"
+.  elif ${CPUTYPE} == "slm" || ${CPUTYPE} == "corei7"
 MACHINE_CPU = sse42 sse41 ssse3 sse3
 .  elif ${CPUTYPE} == "penryn"
 MACHINE_CPU = sse41 ssse3 sse3