diff options
| author | des <des@FreeBSD.org> | 2007-01-17 14:49:13 +0000 |
|---|---|---|
| committer | des <des@FreeBSD.org> | 2007-01-17 14:49:13 +0000 |
| commit | 0252cc4d0f3183ffdb9603ff1f750c93f3b38f50 (patch) | |
| tree | 79509bc8b11e83ef15787de797a60cdcb438f6e2 /share/mk | |
| parent | 7aa8d3d5736bc48746348f1f26f5a4751855a6ab (diff) | |
| download | FreeBSD-src-0252cc4d0f3183ffdb9603ff1f750c93f3b38f50.zip FreeBSD-src-0252cc4d0f3183ffdb9603ff1f750c93f3b38f50.tar.gz | |
Correct errors in previous commit. I didn't realize that ${CPUTYPE} is
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
Diffstat (limited to 'share/mk')
| -rw-r--r-- | share/mk/bsd.cpu.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index 16a535a..cac18c8 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -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 |
