6 files changed, 18 insertions, 35 deletions
diff --git a/configure.py b/configure.py
index 84bc38e8f..ecb627d88 100755
--- a/configure.py
+++ b/configure.py
@@ -1255,10 +1255,9 @@ def create_template_vars(build_config, options, modules, cc, arch, osinfo):
 
         'mp_bits': choose_mp_bits(),
 
-        'cc': (options.compiler_binary or cc.binary_name) + cc.mach_abi_link_flags(options) +
-              ('' if not options.via_amalgamation else all_isa_specific_flags()),
+        'cc': (options.compiler_binary or cc.binary_name) + cc.mach_abi_link_flags(options),
 
-        'lib_opt': cc.opt_flags('lib', options),
+        'lib_opt': cc.opt_flags('lib', options) + (all_isa_specific_flags() if options.via_amalgamation else ''),
         'app_opt': cc.opt_flags('app', options),
         'lang_flags': cc.lang_flags,
         'warn_flags': warning_flags(cc.warning_flags,
diff --git a/src/lib/mac/poly1305/poly1305_donna.h b/src/lib/mac/poly1305/poly1305_donna.h
index fa190baa5..128d0359b 100644
--- a/src/lib/mac/poly1305/poly1305_donna.h
+++ b/src/lib/mac/poly1305/poly1305_donna.h
@@ -12,10 +12,7 @@
 
 #include <botan/loadstor.h>
 #include <botan/mul128.h>
-
-#if !defined(BOTAN_TARGET_HAS_NATIVE_UINT128)
-  #include <botan/internal/donna128.h>
-#endif
+#include <botan/internal/donna128.h>
 
 namespace Botan {
 
@@ -23,11 +20,6 @@ namespace {
 
 #if !defined(BOTAN_TARGET_HAS_NATIVE_UINT128)
 typedef donna128 uint128_t;
-#else
-inline u64bit carry_shift(const uint128_t a, size_t shift)
-   {
-   return static_cast<u64bit>(a >> shift);
-   }
 #endif
 
 void poly1305_init(secure_vector<u64bit>& X, const byte key[32])
diff --git a/src/lib/pubkey/curve25519/donna.cpp b/src/lib/pubkey/curve25519/donna.cpp
index 29d40ce13..8a29e0db9 100644
--- a/src/lib/pubkey/curve25519/donna.cpp
+++ b/src/lib/pubkey/curve25519/donna.cpp
@@ -29,13 +29,10 @@
 
 #include <botan/curve25519.h>
 #include <botan/mul128.h>
+#include <botan/internal/donna128.h>
 #include <botan/loadstor.h>
 #include <string.h>
 
-#if !defined(BOTAN_TARGET_HAS_NATIVE_UINT128)
-  #include <botan/internal/donna128.h>
-#endif
-
 namespace Botan {
 
 typedef byte u8;
@@ -44,20 +41,6 @@ typedef limb felem[5];
 
 #if !defined(BOTAN_TARGET_HAS_NATIVE_UINT128)
 typedef donna128 uint128_t;
-
-#else
-
-inline u64bit carry_shift(const uint128_t a, size_t shift)
-   {
-   return static_cast<u64bit>(a >> shift);
-   }
-
-inline u64bit combine_lower(const uint128_t a, size_t s1,
-                            const uint128_t b, size_t s2)
-   {
-   return static_cast<u64bit>((a >> s1) | (b << s2));
-   }
-
 #endif
 
 /* Sum two numbers: output += in */
diff --git a/src/lib/pubkey/mce/mce_kem.h b/src/lib/pubkey/mce/mce_kem.h
index 14d5cd678..cbb2fc553 100644
--- a/src/lib/pubkey/mce/mce_kem.h
+++ b/src/lib/pubkey/mce/mce_kem.h
@@ -52,4 +52,4 @@ class BOTAN_DLL McEliece_KEM_Decryptor
   };
 }
 
-#endif /* h-guard */
+#endif
diff --git a/src/lib/pubkey/mce/mceliece.h b/src/lib/pubkey/mce/mceliece.h
index b0246ac88..649153233 100644
--- a/src/lib/pubkey/mce/mceliece.h
+++ b/src/lib/pubkey/mce/mceliece.h
@@ -9,16 +9,14 @@
  *
  */
 
-
+#ifndef BOTAN_MCELIECE_H__
+#define BOTAN_MCELIECE_H__
 
 #include <botan/secmem.h>
 #include <botan/types.h>
 #include <botan/pk_ops.h>
 #include <botan/mceliece_key.h>
 
-#ifndef BOTAN_MCELIECE_H__
-#define BOTAN_MCELIECE_H__
-
 #define MASK_LOG2_BYTE ((1 << 3) - 1)
 #define _BITP_TO_BYTEP(__bit_pos) (__bit_pos >> 3)
 #define _BITP_TO_BYTEOFFS(__bit_pos) (__bit_pos & MASK_LOG2_BYTE)
diff --git a/src/lib/utils/donna128.h b/src/lib/utils/donna128.h
index 2cfeb455f..037d9bdfe 100644
--- a/src/lib/utils/donna128.h
+++ b/src/lib/utils/donna128.h
@@ -111,6 +111,17 @@ inline u64bit combine_lower(const donna128 a, size_t s1,
    return z.lo();
    }
 
+inline u64bit carry_shift(const uint128_t a, size_t shift)
+   {
+   return static_cast<u64bit>(a >> shift);
+   }
+
+inline u64bit combine_lower(const uint128_t a, size_t s1,
+                            const uint128_t b, size_t s2)
+   {
+   return static_cast<u64bit>((a >> s1) | (b << s2));
+   }
+
 }
 
 #endif