Fix noinline already defined

[shamirs] / shamirssecret.c

diff --git a/shamirssecret.c b/shamirssecret.c
index c7409e78a689726dc15a77c95551e9ee58b31850..f440f49f21d7d2d9d7413f048b8cc546b38c0536 100644 (file)
--- a/shamirssecret.c
+++ b/shamirssecret.c
@@ -17,8 +17,6 @@
  * Place - Suite 330, Boston, MA 02111-1307 USA.
  */
 
  * Place - Suite 330, Boston, MA 02111-1307 USA.
  */
 

-#include <stdint.h>
-

 #ifndef IN_KERNEL
 #include <assert.h>
 #define CHECKSTATE(x) assert(x)
 #ifndef IN_KERNEL
 #include <assert.h>
 #define CHECKSTATE(x) assert(x)


@@ -29,6 +27,10 @@
 
 #include "shamirssecret.h"
 
 
 #include "shamirssecret.h"
 

+#ifndef noinline
+#define noinline __attribute__((noinline))
+#endif
+

 /*
  * Calculations across the finite field GF(2^8)
  */
 /*
  * Calculations across the finite field GF(2^8)
  */


@@ -87,7 +89,7 @@ static const uint8_t log[P] = {
        0x4a, 0xed, 0xde, 0xc5, 0x31, 0xfe, 0x18, 0x0d, 0x63, 0x8c, 0x80, 0xc0, 0xf7, 0x70, 0x07};
 
 // We disable lots of optimizations that result in non-constant runtime (+/- branch delays)
        0x4a, 0xed, 0xde, 0xc5, 0x31, 0xfe, 0x18, 0x0d, 0x63, 0x8c, 0x80, 0xc0, 0xf7, 0x70, 0x07};
 
 // We disable lots of optimizations that result in non-constant runtime (+/- branch delays)

-static uint8_t field_mul_ret(uint8_t calc, uint8_t a, uint8_t b) __attribute__((optimize("-O0"))) __attribute__((noinline));
+static uint8_t field_mul_ret(uint8_t calc, uint8_t a, uint8_t b) __attribute__((optimize("-O0"))) noinline;

 static uint8_t field_mul_ret(uint8_t calc, uint8_t a, uint8_t b) {
        uint8_t ret, ret2;
        if (a == 0)
 static uint8_t field_mul_ret(uint8_t calc, uint8_t a, uint8_t b) {
        uint8_t ret, ret2;
        if (a == 0)


@@ -110,7 +112,7 @@ static uint8_t field_invert(uint8_t a) {
 }
 
 // We disable lots of optimizations that result in non-constant runtime (+/- branch delays)
 }
 
 // We disable lots of optimizations that result in non-constant runtime (+/- branch delays)

-static uint8_t field_pow_ret(uint8_t calc, uint8_t a, uint8_t e) __attribute__((optimize("-O0"))) __attribute__((noinline));
+static uint8_t field_pow_ret(uint8_t calc, uint8_t a, uint8_t e) __attribute__((optimize("-O0"))) noinline;

 static uint8_t field_pow_ret(uint8_t calc, uint8_t a, uint8_t e) {
        uint8_t ret, ret2;
        if (a == 0)
 static uint8_t field_pow_ret(uint8_t calc, uint8_t a, uint8_t e) {
        uint8_t ret, ret2;
        if (a == 0)