propagate from branch 'net.randombit.botan.1_8' (head 6e8c18515725a70923b34118951252723dd4c29a)

            to branch 'net.randombit.botan' (head 77ba4ea5a4be36d6d029bcc852b2271edff0d679)

16 files changed, 12 insertions, 33 deletions

diff --git a/src/build-data/arch/alpha.txt b/src/build-data/arch/alpha.txt
index 60b264396..b1d939ed1 100644
--- a/src/build-data/arch/alpha.txt
+++ b/src/build-data/arch/alpha.txt
@@ -1,5 +1,3 @@
-realname "DEC Alpha"
-
 default_submodel alpha-ev4
 endian little
 
diff --git a/src/build-data/arch/amd64.txt b/src/build-data/arch/amd64.txt
index 216588e7b..96da0e3a9 100644
--- a/src/build-data/arch/amd64.txt
+++ b/src/build-data/arch/amd64.txt
@@ -1,5 +1,3 @@
-realname "x86-64"
-
 default_submodel opteron
 
 endian little
diff --git a/src/build-data/arch/arm.txt b/src/build-data/arch/arm.txt
index c6be4ad46..5f05d4cad 100644
--- a/src/build-data/arch/arm.txt
+++ b/src/build-data/arch/arm.txt
@@ -1,5 +1,3 @@
-realname "ARM"
-
 default_submodel arm2
 
 <submodels>
diff --git a/src/build-data/arch/hitachi-sh.txt b/src/build-data/arch/hitachi-sh.txt
index 8e9f7eee3..85a741f59 100644
--- a/src/build-data/arch/hitachi-sh.txt
+++ b/src/build-data/arch/hitachi-sh.txt
@@ -1,5 +1,3 @@
-realname "Hitachi SH"
-
 default_submodel hitachi-sh1
 
 <submodels>
diff --git a/src/build-data/arch/hppa.txt b/src/build-data/arch/hppa.txt
index 4cdd40889..67bca263d 100644
--- a/src/build-data/arch/hppa.txt
+++ b/src/build-data/arch/hppa.txt
@@ -1,5 +1,3 @@
-realname "HP-PA"
-
 default_submodel hppa1.0
 
 <aliases>
diff --git a/src/build-data/arch/ia32.txt b/src/build-data/arch/ia32.txt
index aafcf9a77..0fe665e68 100644
--- a/src/build-data/arch/ia32.txt
+++ b/src/build-data/arch/ia32.txt
@@ -1,5 +1,3 @@
-realname "IA-32"
-
 default_submodel i386
 
 endian little
diff --git a/src/build-data/arch/ia64.txt b/src/build-data/arch/ia64.txt
index 7ca84c007..65309f0ff 100644
--- a/src/build-data/arch/ia64.txt
+++ b/src/build-data/arch/ia64.txt
@@ -1,5 +1,3 @@
-realname "IA-64"
-
 # This is safe: only affects tuning, not ISA
 default_submodel itanium2
 
diff --git a/src/build-data/arch/m68k.txt b/src/build-data/arch/m68k.txt
index 27f246abc..3a8b5e8b3 100644
--- a/src/build-data/arch/m68k.txt
+++ b/src/build-data/arch/m68k.txt
@@ -1,7 +1,10 @@
-realname "Motorola 680x0"
-
 default_submodel 68020
 
+endian big
+
+# Except for Coldfire
+#unaligned ok
+
 <aliases>
 680x0
 68k
diff --git a/src/build-data/arch/mips32.txt b/src/build-data/arch/mips32.txt
index 9846c8fb2..ec9d4b5bf 100644
--- a/src/build-data/arch/mips32.txt
+++ b/src/build-data/arch/mips32.txt
@@ -1,5 +1,3 @@
-realname "MIPS"
-
 default_submodel r3000
 
 <aliases>
diff --git a/src/build-data/arch/mips64.txt b/src/build-data/arch/mips64.txt
index dbb49d028..666ba7e18 100644
--- a/src/build-data/arch/mips64.txt
+++ b/src/build-data/arch/mips64.txt
@@ -1,5 +1,3 @@
-realname "MIPS64"
-
 default_submodel r4400
 
 <submodels>
diff --git a/src/build-data/arch/ppc.txt b/src/build-data/arch/ppc.txt
index 16112f389..254643fdd 100644
--- a/src/build-data/arch/ppc.txt
+++ b/src/build-data/arch/ppc.txt
@@ -1,6 +1,5 @@
-realname "PowerPC"
-
 endian big
+unaligned ok
 
 default_submodel ppc604
 
diff --git a/src/build-data/arch/ppc64.txt b/src/build-data/arch/ppc64.txt
index 7c8944faf..f044ba98d 100644
--- a/src/build-data/arch/ppc64.txt
+++ b/src/build-data/arch/ppc64.txt
@@ -1,5 +1,3 @@
-realname "PowerPC 64"
-
 endian big
 
 default_submodel power4
diff --git a/src/build-data/arch/s390.txt b/src/build-data/arch/s390.txt
index 392f51397..8024a4315 100644
--- a/src/build-data/arch/s390.txt
+++ b/src/build-data/arch/s390.txt
@@ -1,7 +1,8 @@
-realname "S/390 31-bit"
-
 default_submodel s390
 
+endian big
+unaligned ok
+
 <submodels>
 s390
 </submodels>
diff --git a/src/build-data/arch/s390x.txt b/src/build-data/arch/s390x.txt
index 49fb0bda7..00daab8b4 100644
--- a/src/build-data/arch/s390x.txt
+++ b/src/build-data/arch/s390x.txt
@@ -1,7 +1,8 @@
-realname "S/390 64-bit"
-
 default_submodel s390x
 
+endian big
+unaligned ok
+
 <submodels>
 s390x
 </submodels>
diff --git a/src/build-data/arch/sparc32.txt b/src/build-data/arch/sparc32.txt
index 6b752df87..57b19c519 100644
--- a/src/build-data/arch/sparc32.txt
+++ b/src/build-data/arch/sparc32.txt
@@ -1,5 +1,3 @@
-realname "SPARC"
-
 # 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
@@ -31,4 +29,3 @@ sparc-v7 -> sparc32-v7
 sparc-v8 -> sparc32-v8
 sparc-v9 -> sparc32-v9
 </submodel_aliases>
-
diff --git a/src/build-data/arch/sparc64.txt b/src/build-data/arch/sparc64.txt
index c0575efc4..e308055fa 100644
--- a/src/build-data/arch/sparc64.txt
+++ b/src/build-data/arch/sparc64.txt
@@ -1,5 +1,3 @@
-realname "SPARC64"
-
 default_submodel sparc64-ultra
 
 <submodels>