From 9747d7db5f1844386de5721948c75ab52174a270 Mon Sep 17 00:00:00 2001
From: mm <mm@FreeBSD.org>
Date: Mon, 7 Mar 2011 14:58:23 +0000
Subject: Add AMD Geode CPU type to bsd.cpu.mk and examples/etc/make.conf For
 CPUTYPE=core2 use -march=core2

PR:		gnu/155308
MFC after:	2 weeks
---
 share/examples/etc/make.conf | 2 +-
 share/mk/bsd.cpu.mk          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'share')

diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf
index 8363d93..516a0e2 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 e48ae08..a22cc06 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
-- 
cgit v1.1