commit: 0aa79899781447509c65a789bb9cc369311c5977
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 11 07:09:07 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 11 07:09:07 2020 +0000
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=0aa79899
catalyst/arch: Remove subarch aliases
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
catalyst/arch/amd64.py | 6 ------
catalyst/arch/mips.py | 2 --
catalyst/arch/x86.py | 5 -----
3 files changed, 13 deletions(-)
diff --git a/catalyst/arch/amd64.py b/catalyst/arch/amd64.py
index 980be552..58904fa2 100644
--- a/catalyst/arch/amd64.py
+++ b/catalyst/arch/amd64.py
@@ -58,15 +58,9 @@ def register():
return ({
"amd64" : arch_amd64,
"k8" : arch_k8,
- "opteron" : arch_k8,
- "athlon64" : arch_k8,
- "athlonfx" : arch_k8,
"nocona" : arch_nocona,
"core2" : arch_core2,
"k8-sse3" : arch_k8_sse3,
- "opteron-sse3" : arch_k8_sse3,
- "athlon64-sse3" : arch_k8_sse3,
"amdfam10" : arch_amdfam10,
- "barcelona" : arch_amdfam10,
"x32" : arch_x32,
}, ("x86_64","amd64","nocona"))
diff --git a/catalyst/arch/mips.py b/catalyst/arch/mips.py
index 1ac6f85d..f7fbcc5b 100644
--- a/catalyst/arch/mips.py
+++ b/catalyst/arch/mips.py
@@ -432,7 +432,6 @@ def register():
return ({
"cobalt" : arch_cobalt,
"cobalt_n32" : arch_cobalt_n32,
- "mips" : arch_mips1,
"mips1" : arch_mips1,
"mips2" : arch_mips2,
"mips32" : arch_mips32,
@@ -463,7 +462,6 @@ def register():
"mips64r2_n32" : arch_mips64r2_n32,
"mips64r2_n64" : arch_mips64r2_n64,
"mips64r2_multilib" :
arch_mips64r2_multilib,
- "mipsel" : arch_mipsel1,
"mipsel1" : arch_mipsel1,
"mipsel2" : arch_mipsel2,
"mips32el" : arch_mips32el,
diff --git a/catalyst/arch/x86.py b/catalyst/arch/x86.py
index 4e50fea9..307365dc 100644
--- a/catalyst/arch/x86.py
+++ b/catalyst/arch/x86.py
@@ -125,10 +125,8 @@ def register():
"pentium" : arch_i586,
"pentium2" : arch_pentium2,
"pentium3" : arch_pentium3,
- "pentium3m" : arch_pentium3,
"pentium-m" : arch_pentium_m,
"pentium4" : arch_pentium4,
- "pentium4m" : arch_pentium4,
"pentiumpro" : arch_i686,
"pentium-mmx" : arch_pentium_mmx,
"prescott" : arch_prescott,
@@ -136,8 +134,5 @@ def register():
"k6-2" : arch_k6_2,
"k6-3" : arch_k6_2,
"athlon" : arch_athlon,
- "athlon-tbird" : arch_athlon,
- "athlon-4" : arch_athlon_xp,
"athlon-xp" : arch_athlon_xp,
- "athlon-mp" : arch_athlon_xp
}, ('i386', 'i486', 'i586', 'i686'))
