summaryrefslogtreecommitdiffstats
path: root/share/mk
diff options
context:
space:
mode:
authordes <des@FreeBSD.org>2007-01-17 12:43:06 +0000
committerdes <des@FreeBSD.org>2007-01-17 12:43:06 +0000
commitef3eb6c935523a9e78fec53d2695246bda23a3f0 (patch)
tree6984050dac02232d1c0d36d84db4208ec6a66e25 /share/mk
parentc778226d2fb5853db425faa7e982eb2549624c50 (diff)
downloadFreeBSD-src-ef3eb6c935523a9e78fec53d2695246bda23a3f0.zip
FreeBSD-src-ef3eb6c935523a9e78fec53d2695246bda23a3f0.tar.gz
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
Diffstat (limited to 'share/mk')
-rw-r--r--share/mk/bsd.cpu.mk10
1 files changed, 7 insertions, 3 deletions
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk
index 5425e01..16a535a 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
OpenPOWER on IntegriCloud