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

Add opteron-sse3, athlon64-sse3 and k8-sse3 cpu types to bsd.cpu.mk.

Browse Source 
- add "sse3" to MACHINE_CPU for the new cpu types
- for i386, default to CPUTYPE=prescott for the new cpu types

PR:		gnu/154906
Discussed with:	kib, kan, dim
MFC after:	2 weeks
This commit is contained in:
Martin Matuska 2011-02-20 22:32:21 +00:00
parent c33f0aaf60
commit c42ed003e9
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,8 +30,9 @@
# NO_CPU_CFLAGS variable below. # NO_CPU_CFLAGS variable below.
# Currently the following CPU types are recognized: # Currently the following CPU types are recognized:
# Intel x86 architecture: # Intel x86 architecture:
# (AMD CPUs) opteron athlon64 athlon-mp athlon-xp athlon-4 # (AMD CPUs) opteron-sse3 opteron athlon64-sse3 athlon64 athlon-mp
# athlon-tbird athlon k8 k6-3 k6-2 k6 k5 # athlon-xp athlon-4 athlon-tbird athlon k8-sse3 k8
# k6-3 k6-2 k6 k5
# (Intel CPUs) core2 core nocona pentium4m pentium4 prescott # (Intel CPUs) core2 core nocona pentium4m pentium4 prescott
# pentium3m pentium3 pentium-m pentium2 # pentium3m pentium3 pentium-m pentium2
# pentiumpro pentium-mmx pentium i486 i386 # pentiumpro pentium-mmx pentium i486 i386

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

@ -49,6 +49,9 @@ CPUTYPE = pentiumpro
CPUTYPE = pentium-mmx CPUTYPE = pentium-mmx
. elif ${CPUTYPE} == "i586" . elif ${CPUTYPE} == "i586"
CPUTYPE = pentium CPUTYPE = pentium
. elif ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || \
${CPUTYPE} == "k8-sse3"
CPUTYPE = prescott
. elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \ . elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || \
${CPUTYPE} == "k8" ${CPUTYPE} == "k8"
CPUTYPE = athlon-mp CPUTYPE = athlon-mp
@ -158,7 +161,9 @@ _CPUCFLAGS = -mcpu=ultrasparc3
# presence of a CPU feature. # presence of a CPU feature.
. if ${MACHINE_CPUARCH} == "i386" . if ${MACHINE_CPUARCH} == "i386"
. if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" . if ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3"
MACHINE_CPU = athlon-xp athlon k7 3dnow sse3 sse2 sse mmx k6 k5 i586 i486 i386
. elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64"
MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586 i486 i386 MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586 i486 i386
. elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \ . elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || \
${CPUTYPE} == "athlon-4" ${CPUTYPE} == "athlon-4"
@ -197,7 +202,9 @@ MACHINE_CPU = i486 i386
MACHINE_CPU = i386 MACHINE_CPU = i386
. endif . endif
. elif ${MACHINE_CPUARCH} == "amd64" . elif ${MACHINE_CPUARCH} == "amd64"
. if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8" . if ${CPUTYPE} == "opteron-sse3" || ${CPUTYPE} == "athlon64-sse3" || ${CPUTYPE} == "k8-sse3"
MACHINE_CPU = k8 3dnow sse3
. elif ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8"
MACHINE_CPU = k8 3dnow MACHINE_CPU = k8 3dnow
. elif ${CPUTYPE} == "nocona" . elif ${CPUTYPE} == "nocona"
MACHINE_CPU = sse3 MACHINE_CPU = sse3