From 28244907a1c3a3400396433ba942f1a31bad6f8f Mon Sep 17 00:00:00 2001
From: Frank Denis <github@pureftpd.org>
Date: Sat, 21 Nov 2015 13:14:48 +0100
Subject: [PATCH] Don't force inline

---
 .../poly1305/sse2/poly1305_sse2.c             |  5 +----
 .../donna_c64/curve25519_donna_c64.c          | 21 ++++++++-----------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c b/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c
index f5f545a7..db581694 100644
--- a/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c
+++ b/src/libsodium/crypto_onetimeauth/poly1305/sse2/poly1305_sse2.c
@@ -13,9 +13,6 @@
 
 #include <emmintrin.h>
 
-#undef force_inline
-#define force_inline __attribute__((always_inline))
-
 typedef __m128i xmmi;
 
 #if defined(__SIZEOF_INT128__)
@@ -57,7 +54,7 @@ typedef struct poly1305_state_internal_t {
 } poly1305_state_internal_t;   /* 164 bytes total */
 
 /* copy 0-31 bytes */
-static void force_inline
+static inline void
 poly1305_block_copy31(unsigned char *dst, const unsigned char *src, unsigned long long bytes)
 {
     unsigned long long offset = src - dst;
diff --git a/src/libsodium/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.c b/src/libsodium/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.c
index 289c5425..66c45758 100644
--- a/src/libsodium/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.c
+++ b/src/libsodium/crypto_scalarmult/curve25519/donna_c64/curve25519_donna_c64.c
@@ -38,11 +38,8 @@ typedef limb felem[5];
 // platforms only as far as I know.
 typedef unsigned uint128_t __attribute__((mode(TI)));
 
-#undef force_inline
-#define force_inline __attribute__((always_inline))
-
 /* Sum two numbers: output += in */
-static inline void force_inline
+static inline void
 fsum(limb *output, const limb *in) {
   output[0] += in[0];
   output[1] += in[1];
@@ -57,7 +54,7 @@ fsum(limb *output, const limb *in) {
  * Assumes that out[i] < 2**52
  * On return, out[i] < 2**55
  */
-static inline void force_inline
+static inline void
 fdifference_backwards(felem out, const felem in) {
   /* 152 is 19 << 3 */
   static const limb two54m152 = (((limb)1) << 54) - 152;
@@ -71,7 +68,7 @@ fdifference_backwards(felem out, const felem in) {
 }
 
 /* Multiply a number by a scalar: output = in * scalar */
-static inline void force_inline
+static inline void
 fscalar_product(felem output, const felem in, const limb scalar) {
   uint128_t a;
 
@@ -101,7 +98,7 @@ fscalar_product(felem output, const felem in, const limb scalar) {
  * Assumes that in[i] < 2**55 and likewise for in2.
  * On return, output[i] < 2**52
  */
-static inline void force_inline
+static inline void
 fmul(felem output, const felem in2, const felem in) {
   uint128_t t[5];
   limb r0,r1,r2,r3,r4,s0,s1,s2,s3,s4,c;
@@ -150,7 +147,7 @@ fmul(felem output, const felem in2, const felem in) {
   output[4] = r4;
 }
 
-static inline void force_inline
+static inline void
 fsquare_times(felem output, const felem in, limb count) {
   uint128_t t[5];
   limb r0,r1,r2,r3,r4,c;
@@ -193,18 +190,18 @@ fsquare_times(felem output, const felem in, limb count) {
 }
 
 #ifdef NATIVE_LITTLE_ENDIAN
-static inline limb force_inline
+static inline limb
 load_limb(const u8 *in) {
     limb out;
     memcpy(&out, in, sizeof (limb));
     return out;
 }
-static inline void force_inline
+static inline void
 store_limb(u8 *out, limb in) {
     memcpy(out, &in, sizeof (limb));
 }
 #else
-static inline limb force_inline
+static inline limb
 load_limb(const u8 *in) {
   return
     ((limb)in[0]) |
@@ -217,7 +214,7 @@ load_limb(const u8 *in) {
     (((limb)in[7]) << 56);
 }
 
-static inline void force_inline
+static inline void
 store_limb(u8 *out, limb in) {
   out[0] = in & 0xff;
   out[1] = (in >> 8) & 0xff;