commit 095c70b7af571a61970ff8d212828b000c26eea2 Author: Nick Mathewson nickm@torproject.org Date: Thu Dec 6 12:08:04 2012 -0500

Use always_inline only with inline; otherwise GCC gripes --- src/ext/curve25519_donna/curve25519-donna-c64.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/ext/curve25519_donna/curve25519-donna-c64.c b/src/ext/curve25519_donna/curve25519-donna-c64.c index b8ad62e..38b94e7 100644 --- a/src/ext/curve25519_donna/curve25519-donna-c64.c +++ b/src/ext/curve25519_donna/curve25519-donna-c64.c @@ -36,7 +36,7 @@ typedef unsigned uint128_t __attribute__((mode(TI))); #define force_inline __attribute__((always_inline))

/* Sum two numbers: output += in */ -static void force_inline +static inline void force_inline fsum(limb *output, const limb *in) { output[0] += in[0]; output[1] += in[1]; @@ -51,7 +51,7 @@ fsum(limb *output, const limb *in) { * Assumes that out[i] < 2**52 * On return, out[i] < 2**55 */ -static void force_inline +static inline void force_inline fdifference_backwards(felem out, const felem in) { /* 152 is 19 << 3 */ static const limb two54m152 = (((limb)1) << 54) - 152; @@ -65,7 +65,7 @@ fdifference_backwards(felem out, const felem in) { }

/* Multiply a number by a scalar: output = in * scalar */ -static void force_inline +static inline void force_inline fscalar_product(felem output, const felem in, const limb scalar) { uint128_t a;

@@ -95,7 +95,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 void force_inline +static inline void force_inline 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; @@ -144,7 +144,7 @@ fmul(felem output, const felem in2, const felem in) { output[4] = r4; }

-static void force_inline +static inline void force_inline fsquare_times(felem output, const felem in, limb count) { uint128_t t[5]; limb r0,r1,r2,r3,r4,c;