propagate from branch 'net.randombit.botan' (head ca7d7fc1ae6b55c5328c9cf1ec1cafd1daadedd4)

            to branch 'net.randombit.botan.modularized' (head 614263a9742a0c554e4093620147f6e156264d41)

5 files changed, 6 insertions, 6 deletions

diff --git a/misc/config/arch/alpha b/misc/config/arch/alpha
index 16159207f..60b264396 100644
--- a/misc/config/arch/alpha
+++ b/misc/config/arch/alpha
@@ -1,6 +1,6 @@
 realname "DEC Alpha"
 
-default_submodel alpha-ev5
+default_submodel alpha-ev4
 endian little
 
 <aliases>
diff --git a/misc/config/arch/hppa b/misc/config/arch/hppa
index e01da76db..4cdd40889 100644
--- a/misc/config/arch/hppa
+++ b/misc/config/arch/hppa
@@ -1,6 +1,6 @@
 realname "HP-PA"
 
-default_submodel hppa1.1
+default_submodel hppa1.0
 
 <aliases>
 hp-pa
diff --git a/misc/config/arch/ia32 b/misc/config/arch/ia32
index 1d2b36af1..5976c5c78 100644
--- a/misc/config/arch/ia32
+++ b/misc/config/arch/ia32
@@ -1,6 +1,6 @@
 realname "IA-32"
 
-default_submodel i686
+default_submodel i386
 
 endian little
 unaligned ok
@@ -18,6 +18,7 @@ i486
 i586
 i686
 pentium4
+pentium-m
 k6
 athlon
 </submodels>
diff --git a/misc/config/arch/m68k b/misc/config/arch/m68k
index 324a724b8..27f246abc 100644
--- a/misc/config/arch/m68k
+++ b/misc/config/arch/m68k
@@ -1,6 +1,6 @@
 realname "Motorola 680x0"
 
-default_submodel 68040
+default_submodel 68020
 
 <aliases>
 680x0
diff --git a/misc/config/arch/ppc b/misc/config/arch/ppc
index 0f7ceac2b..16112f389 100644
--- a/misc/config/arch/ppc
+++ b/misc/config/arch/ppc
@@ -2,8 +2,7 @@ realname "PowerPC"
 
 endian big
 
-# G3; probably a reasonable assumption these days
-default_submodel ppc740
+default_submodel ppc604
 
 <aliases>
 powerpc