d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

On i386, make "prescott" an alias for "nocona" (instead of the other way

Browse Source 
around), and introduce "core", along with the alias "core2".  All of these
enable SSE3.

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

MFC after:	3 weeks
This commit is contained in:
Dag-Erling Smørgrav 2007-01-17 12:43:06 +00:00
parent 740ae2a34c
commit 3f15422a91
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
share/examples/etc/make.conf
View File

@ -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.)

10
share/mk/bsd.cpu.mk
View File

@ -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