From 2a6629d9971dba08f2b96537c72d231e91106b4c Mon Sep 17 00:00:00 2001
From: Raúl Porcel <armin76@gentoo.org>
Date: Sat, 5 Feb 2011 18:27:51 +0000
Subject: Enable new amd64 subarches

---
 ChangeLog                      |  6 +++++-
 modules/catalyst/arch/amd64.py | 13 ++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e6facb20..2e0f47b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,12 @@
 # ChangeLog for catalyst
-# Copyright 1999-2010 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
+# Copyright 1999-2011 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 # $Id$
 
+  05 Feb 2011; Raúl Porcel <armin76@gentoo.org>
+  modules/catalyst/arch/amd64.py:
+  Enable new amd64 subarches
+
   01 Nov 2010; Raúl Porcel <armin76@gentoo.org>
   modules/catalyst/arch/mips.py:
   Add patch for Loongson support, patch by Zhang Le <r0bertz at gentoo dot
diff --git a/modules/catalyst/arch/amd64.py b/modules/catalyst/arch/amd64.py
index c6e00182..bab57d3b 100644
--- a/modules/catalyst/arch/amd64.py
+++ b/modules/catalyst/arch/amd64.py
@@ -61,13 +61,12 @@ _subarch_map = {
 	"athlon64"	: arch_k8,
 	"athlonfx"	: arch_k8,
 	"nocona"	: arch_nocona,
-# uncomment when gcc 4.3 is stable and delete this line
-#	"core2"		: arch_core2,
-#	"k8-sse3"	: arch_k8_sse3,
-#	"opteron-sse3"	: arch_k8_sse3,
-#	"athlon64-sse3"	: arch_k8_sse3,
-#	"amdfam10"	: arch_amdfam10,
-#	"barcelona"	: arch_amdfam10
+	"core2"		: arch_core2,
+	"k8-sse3"	: arch_k8_sse3,
+	"opteron-sse3"	: arch_k8_sse3,
+	"athlon64-sse3"	: arch_k8_sse3,
+	"amdfam10"	: arch_amdfam10,
+	"barcelona"	: arch_amdfam10
 }
 
 _machine_map = ("x86_64","amd64","nocona")
-- 
cgit v1.2.3-65-gdbad