5 files changed, 24 insertions, 0 deletions
diff --git a/src/build-data/arch/m68k b/src/build-data/arch/m68k
index 27f246abc..759a3dac1 100644
--- a/src/build-data/arch/m68k
+++ b/src/build-data/arch/m68k
@@ -2,6 +2,11 @@ realname "Motorola 680x0"
 
 default_submodel 68020
 
+endian big
+
+# Except for Coldfire
+#unaligned ok
+
 <aliases>
 680x0
 68k
diff --git a/src/build-data/arch/ppc b/src/build-data/arch/ppc
index 16112f389..e2dfa6ea2 100644
--- a/src/build-data/arch/ppc
+++ b/src/build-data/arch/ppc
@@ -1,6 +1,7 @@
 realname "PowerPC"
 
 endian big
+unaligned ok
 
 default_submodel ppc604
 
diff --git a/src/build-data/arch/s390 b/src/build-data/arch/s390
index 392f51397..312b262c4 100644
--- a/src/build-data/arch/s390
+++ b/src/build-data/arch/s390
@@ -2,6 +2,9 @@ realname "S/390 31-bit"
 
 default_submodel s390
 
+endian big
+unaligned ok
+
 <submodels>
 s390
 </submodels>
diff --git a/src/build-data/arch/s390x b/src/build-data/arch/s390x
index 49fb0bda7..9fe6bd615 100644
--- a/src/build-data/arch/s390x
+++ b/src/build-data/arch/s390x
@@ -2,6 +2,9 @@ realname "S/390 64-bit"
 
 default_submodel s390x
 
+endian big
+unaligned ok
+
 <submodels>
 s390x
 </submodels>
diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in
index e4ab0f44b..e0d8368ed 100644
--- a/src/build-data/buildh.in
+++ b/src/build-data/buildh.in
@@ -22,6 +22,18 @@
 #define BOTAN_KARAT_SQR_THRESHOLD 32
 #define BOTAN_PRIVATE_KEY_OP_BLINDING_BITS 64
 
+/*
+* Toggles for parallel block cipher mode processing
+*
+* CBC and CFB can only use parallel processing in decryption mode
+*/
+#define BOTAN_PARALLEL_BLOCKS_ECB 8
+#define BOTAN_PARALLEL_BLOCKS_CBC 8
+#define BOTAN_PARALLEL_BLOCKS_CFB 8
+#define BOTAN_PARALLEL_BLOCKS_CTR 8
+#define BOTAN_PARALLEL_BLOCKS_EAX 8
+#define BOTAN_PARALLEL_BLOCKS_XTS 8
+
 /* PK key consistency checking toggles */
 #define BOTAN_PUBLIC_KEY_STRONG_CHECKS_ON_LOAD 1
 #define BOTAN_PRIVATE_KEY_STRONG_CHECKS_ON_LOAD 1