From ef3eb6c935523a9e78fec53d2695246bda23a3f0 Mon Sep 17 00:00:00 2001
From: des <des@FreeBSD.org>
Date: Wed, 17 Jan 2007 12:43:06 +0000
Subject: [PATCH] On i386, make "prescott" an alias for "nocona" (instead of
 the other way around), and introduce "core", along with the alias "core2". 
 All of these enable SSE3.

On amd64, add "core2" (enables SSE3).

MFC after:	3 weeks
---
 share/examples/etc/make.conf |  7 ++++---
 share/mk/bsd.cpu.mk          | 10 +++++++---
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 8d47d7e37375..1e08f79c8a9f 100644
--- a/share/examples/etc/make.conf
+++ b/share/examples/etc/make.conf
@@ -32,11 +32,12 @@
 #   Intel x86 architecture:
 #       (AMD CPUs)	opteron athlon64 athlon-mp athlon-xp athlon-4
 #			athlon-tbird athlon k8 k6-3 k6-2 k6 k5
-#       (Intel CPUs)	nocona pentium4[m] prescott pentium3[m] pentium-m
-#			pentium2 pentiumpro pentium-mmx pentium i486 i386
+#       (Intel CPUs)	core2 core nocona pentium4m pentium4 prescott
+#			pentium3m pentium3 pentium-m pentium2
+#			pentiumpro pentium-mmx pentium i486 i386
 #       (Via CPUs)	c3 c3-2
 #   Alpha/AXP architecture: ev67 ev6 pca56 ev56 ev5 ev45 ev4
-#   AMD64 architecture: opteron, athlon64, nocona
+#   AMD64 architecture: opteron, athlon64, nocona, prescott, core2
 #   Intel ia64 architecture: itanium2, itanium
 #
 # (?= allows to buildworld for a different CPUTYPE.)
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 5425e011423e..16a535a92eae 100644
--- a/share/mk/bsd.cpu.mk
+++ b/share/mk/bsd.cpu.mk
@@ -22,8 +22,10 @@ MACHINE_CPU = arm
 # between e.g. i586 and pentium)
 
 . if ${MACHINE_ARCH} == "i386"
-.  if ${CPUTYPE} == "nocona"
-CPUTYPE = prescott
+.  if ${CPUTYPE} == "prescott"
+CPUTYPE = nocona
+.  elif ${CPUTYPE} == "core2"
+CPUTYPE = core
 .  elif ${CPUTYPE} == "p4"
 CPUTYPE = pentium4
 .  elif ${CPUTYPE} == "p4m"
@@ -131,6 +133,8 @@ MACHINE_CPU = k5 i586 i486 i386
 MACHINE_CPU = 3dnow mmx i586 i486 i386
 .  elif ${CPUTYPE} == "c3-2"
 MACHINE_CPU = sse mmx i586 i486 i386
+.  elif ${CPUTYPE} == "nocona" || ${CPUTYPE} == "core"
+MACHINE_CPU = sse3 sse2 sse i686 mmx i586 i486 i386
 .  elif ${CPUTYPE} == "pentium4" || ${CPUTYPE} == "pentium4m" || ${CPUTYPE} == "pentium-m"
 MACHINE_CPU = sse2 sse i686 mmx i586 i486 i386
 .  elif ${CPUTYPE} == "pentium3" || ${CPUTYPE} == "pentium3m"
@@ -151,7 +155,7 @@ MACHINE_CPU = i386
 . elif ${MACHINE_ARCH} == "amd64"
 .  if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8"
 MACHINE_CPU = k8 3dnow
-.  elif ${CPUTYPE} == "nocona"
+.  elif ${CPUTYPE} == "nocona" || ${CPUTYPE} == "core2"
 MACHINE_CPU = sse3
 .  endif
 MACHINE_CPU += amd64 sse2 sse mmx