16 files changed, 7 insertions, 37 deletions
diff --git a/src/build-data/arch/alpha.txt b/src/build-data/arch/alpha.txt
index b1d939ed1..2bf72edef 100644
--- a/src/build-data/arch/alpha.txt
+++ b/src/build-data/arch/alpha.txt
@@ -1,4 +1,3 @@
-default_submodel alpha-ev4
 endian little
 
 <aliases>
diff --git a/src/build-data/arch/amd64.txt b/src/build-data/arch/amd64.txt
index 58b24addb..6bce86dff 100644
--- a/src/build-data/arch/amd64.txt
+++ b/src/build-data/arch/amd64.txt
@@ -1,5 +1,3 @@
-default_submodel k8
-
 endian little
 unaligned ok
 
diff --git a/src/build-data/arch/arm.txt b/src/build-data/arch/arm.txt
index b247466e6..77f15b1d9 100644
--- a/src/build-data/arch/arm.txt
+++ b/src/build-data/arch/arm.txt
@@ -1,5 +1,3 @@
-default_submodel arm2
-
 <submodels>
 arm2
 arm3
diff --git a/src/build-data/arch/hitachi-sh.txt b/src/build-data/arch/hitachi-sh.txt
index 85a741f59..bab84b48f 100644
--- a/src/build-data/arch/hitachi-sh.txt
+++ b/src/build-data/arch/hitachi-sh.txt
@@ -1,5 +1,3 @@
-default_submodel hitachi-sh1
-
 <submodels>
 hitachi-sh1
 hitachi-sh2
diff --git a/src/build-data/arch/hppa.txt b/src/build-data/arch/hppa.txt
index 67bca263d..0f7d90c68 100644
--- a/src/build-data/arch/hppa.txt
+++ b/src/build-data/arch/hppa.txt
@@ -1,5 +1,3 @@
-default_submodel hppa1.0
-
 <aliases>
 hp-pa
 parisc
diff --git a/src/build-data/arch/ia32.txt b/src/build-data/arch/ia32.txt
index 5012909f2..40066851d 100644
--- a/src/build-data/arch/ia32.txt
+++ b/src/build-data/arch/ia32.txt
@@ -1,5 +1,3 @@
-default_submodel i386
-
 endian little
 unaligned ok
 
diff --git a/src/build-data/arch/ia64.txt b/src/build-data/arch/ia64.txt
index 65309f0ff..55967d5ab 100644
--- a/src/build-data/arch/ia64.txt
+++ b/src/build-data/arch/ia64.txt
@@ -1,13 +1,14 @@
-# This is safe: only affects tuning, not ISA
-default_submodel itanium2
-
 <aliases>
-merced
 itanium
+itanic
 </aliases>
 
 <submodels>
-itanium1
-itanium2
+merced
 mckinley
+montvale
 </submodels>
+
+<submodel_aliases>
+itanium2 -> mckinley
+</submodel_aliases>
diff --git a/src/build-data/arch/m68k.txt b/src/build-data/arch/m68k.txt
index 3a8b5e8b3..691c45b92 100644
--- a/src/build-data/arch/m68k.txt
+++ b/src/build-data/arch/m68k.txt
@@ -1,5 +1,3 @@
-default_submodel 68020
-
 endian big
 
 # Except for Coldfire
diff --git a/src/build-data/arch/mips32.txt b/src/build-data/arch/mips32.txt
index ec9d4b5bf..b69abdacb 100644
--- a/src/build-data/arch/mips32.txt
+++ b/src/build-data/arch/mips32.txt
@@ -1,5 +1,3 @@
-default_submodel r3000
-
 <aliases>
 mips
 mipsel # For Debian
diff --git a/src/build-data/arch/mips64.txt b/src/build-data/arch/mips64.txt
index 666ba7e18..a2fd5849b 100644
--- a/src/build-data/arch/mips64.txt
+++ b/src/build-data/arch/mips64.txt
@@ -1,5 +1,3 @@
-default_submodel r4400
-
 <submodels>
 r4000
 r4100
diff --git a/src/build-data/arch/ppc.txt b/src/build-data/arch/ppc.txt
index b9332913a..811eb53e7 100644
--- a/src/build-data/arch/ppc.txt
+++ b/src/build-data/arch/ppc.txt
@@ -1,8 +1,6 @@
 endian big
 unaligned ok
 
-default_submodel ppc604
-
 <aliases>
 powerpc
 </aliases>
diff --git a/src/build-data/arch/ppc64.txt b/src/build-data/arch/ppc64.txt
index 36c92d198..b99aa9b8b 100644
--- a/src/build-data/arch/ppc64.txt
+++ b/src/build-data/arch/ppc64.txt
@@ -1,7 +1,5 @@
 endian big
 
-default_submodel power4
-
 <aliases>
 powerpc64
 </aliases>
diff --git a/src/build-data/arch/s390.txt b/src/build-data/arch/s390.txt
index 8024a4315..6e9f99f12 100644
--- a/src/build-data/arch/s390.txt
+++ b/src/build-data/arch/s390.txt
@@ -1,5 +1,3 @@
-default_submodel s390
-
 endian big
 unaligned ok
 
diff --git a/src/build-data/arch/s390x.txt b/src/build-data/arch/s390x.txt
index 00daab8b4..6f4271607 100644
--- a/src/build-data/arch/s390x.txt
+++ b/src/build-data/arch/s390x.txt
@@ -1,5 +1,3 @@
-default_submodel s390x
-
 endian big
 unaligned ok
 
diff --git a/src/build-data/arch/sparc32.txt b/src/build-data/arch/sparc32.txt
index 57b19c519..ae75a2a4b 100644
--- a/src/build-data/arch/sparc32.txt
+++ b/src/build-data/arch/sparc32.txt
@@ -1,7 +1,3 @@
-# V7 doesn't have integer multiply, so it will be bitterly slow for some things
-# (especially BigInt). Also, it's fairly rare nowadays, so we default to V8.
-default_submodel sparc32-v8
-
 endian big
 
 <aliases>
diff --git a/src/build-data/arch/sparc64.txt b/src/build-data/arch/sparc64.txt
index e308055fa..8f62e66f6 100644
--- a/src/build-data/arch/sparc64.txt
+++ b/src/build-data/arch/sparc64.txt
@@ -1,5 +1,3 @@
-default_submodel sparc64-ultra
-
 <submodels>
 sparc64-ultra
 sparc64-ultra2