diff options
Diffstat (limited to 'share')
-rw-r--r-- | share/examples/etc/make.conf | 2 | ||||
-rw-r--r-- | share/mk/bsd.cpu.mk | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 8363d9302466..516a0e20edf3 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -32,7 +32,7 @@ # Intel x86 architecture: # (AMD CPUs) opteron-sse3 opteron athlon64-sse3 athlon64 athlon-mp # athlon-xp athlon-4 athlon-tbird athlon k8-sse3 k8 -# k6-3 k6-2 k6 k5 +# geode k6-3 k6-2 k6 k5 # (Intel CPUs) core2 core nocona pentium4m pentium4 prescott # pentium3m pentium3 pentium-m pentium2 # pentiumpro pentium-mmx pentium i486 i386 diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index e48ae08e5f44..a22cc06ec354 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -59,7 +59,7 @@ CPUTYPE = athlon-mp CPUTYPE = athlon . endif . elif ${MACHINE_CPUARCH} == "amd64" -. if ${CPUTYPE} == "prescott" || ${CPUTYPE} == "core2" +. if ${CPUTYPE} == "prescott" CPUTYPE = nocona . endif . elif ${MACHINE_ARCH} == "sparc64" @@ -170,7 +170,7 @@ MACHINE_CPU = athlon-xp athlon k7 3dnow sse2 sse mmx k6 k5 i586 i486 i386 MACHINE_CPU = athlon-xp athlon k7 3dnow sse mmx k6 k5 i586 i486 i386 . elif ${CPUTYPE} == "athlon" || ${CPUTYPE} == "athlon-tbird" MACHINE_CPU = athlon k7 3dnow mmx k6 k5 i586 i486 i386 -. elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2" +. elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2" || ${CPUTYPE} == "geode" MACHINE_CPU = 3dnow mmx k6 k5 i586 i486 i386 . elif ${CPUTYPE} == "k6" MACHINE_CPU = mmx k6 k5 i586 i486 i386 @@ -206,7 +206,7 @@ MACHINE_CPU = i386 MACHINE_CPU = k8 3dnow sse3 . elif ${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 |