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

Correct errors in previous commit. I didn't realize that ${CPUTYPE} is

Browse Source 
passed unmodified to gcc.  Therefore, "prescott" should be used for Prescott,
Nocona, Core and Core 2 CPUs when building 32-bit code, and "nocona" should
be used for Prescott, Nocona and Core 2 CPUs when building 64-bit code.

MFC after:	3 weeks
This commit is contained in:
des 2007-01-17 14:49:13 +00:00
parent 7aa8d3d573
commit 0252cc4d0f
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,10 +22,10 @@ MACHINE_CPU = arm
# between e.g. i586 and pentium)
. if ${MACHINE_ARCH} == "i386"
. if ${CPUTYPE} == "prescott"
CPUTYPE = nocona
. elif ${CPUTYPE} == "core2"
CPUTYPE = core
. if ${CPUTYPE} == "nocona"
CPUTYPE = prescott
. elif ${CPUTYPE} == "core" || ${CPUTYPE} == "core2"
CPUTYPE = prescott
. elif ${CPUTYPE} == "p4"
CPUTYPE = pentium4
. elif ${CPUTYPE} == "p4m"
@ -133,7 +133,7 @@ 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"
. elif ${CPUTYPE} == "prescott"
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
@ -155,7 +155,7 @@ MACHINE_CPU = i386
. elif ${MACHINE_ARCH} == "amd64"
. if ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "k8"
MACHINE_CPU = k8 3dnow
. elif ${CPUTYPE} == "nocona" || ${CPUTYPE} == "core2"
. elif ${CPUTYPE} == "nocona"
MACHINE_CPU = sse3
. endif
MACHINE_CPU += amd64 sse2 sse mmx