1*4882a593SmuzhiyunFrom 9c71a211dcf20f53f747326f5bc3fee9fabe3f52 Mon Sep 17 00:00:00 2001 2*4882a593SmuzhiyunFrom: Julien Viard de Galbert <julien@vdg.name> 3*4882a593SmuzhiyunDate: Tue, 27 Jun 2017 00:16:11 +0200 4*4882a593SmuzhiyunSubject: [PATCH] Add static to inline functions 5*4882a593Smuzhiyun 6*4882a593SmuzhiyunThis is needed to avoid a link error where the inline functions appear 7*4882a593Smuzhiyunmissing at link time. 8*4882a593SmuzhiyunFrom c99 standard inline function should either be declared static or 9*4882a593Smuzhiyunhave an extern instance in a c file for linking. 10*4882a593SmuzhiyunThis fix is necessary to build with gcc 7; for some reason it was not 11*4882a593Smuzhiyuntrigerred before. 12*4882a593Smuzhiyun 13*4882a593SmuzhiyunSigned-off-by: Julien Viard de Galbert <julien@vdg.name> 14*4882a593Smuzhiyun--- 15*4882a593Smuzhiyun libdieharder/dab_filltree.c | 4 ++-- 16*4882a593Smuzhiyun libdieharder/dab_filltree2.c | 4 ++-- 17*4882a593Smuzhiyun 2 files changed, 4 insertions(+), 4 deletions(-) 18*4882a593Smuzhiyun 19*4882a593Smuzhiyundiff --git a/libdieharder/dab_filltree.c b/libdieharder/dab_filltree.c 20*4882a593Smuzhiyunindex 9cc5ce7..a377c3d 100644 21*4882a593Smuzhiyun--- a/libdieharder/dab_filltree.c 22*4882a593Smuzhiyun+++ b/libdieharder/dab_filltree.c 23*4882a593Smuzhiyun@@ -34,7 +34,7 @@ static double targetData[] = { 24*4882a593Smuzhiyun 0.0, 0.0, 0.0, 0.0, 0.13333333, 0.20000000, 0.20634921, 0.17857143, 0.13007085, 0.08183633, 0.04338395, 0.01851828, 0.00617270, 0.00151193, 0.00023520, 0.00001680, 0.00000000, 0.00000000, 0.00000000, 0.00000000 25*4882a593Smuzhiyun }; 26*4882a593Smuzhiyun 27*4882a593Smuzhiyun-inline int insert(double x, double *array, unsigned int startVal); 28*4882a593Smuzhiyun+static inline int insert(double x, double *array, unsigned int startVal); 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun int dab_filltree(Test **test,int irun) { 31*4882a593Smuzhiyun int size = (ntuple == 0) ? 32 : ntuple; 32*4882a593Smuzhiyun@@ -105,7 +105,7 @@ int dab_filltree(Test **test,int irun) { 33*4882a593Smuzhiyun } 34*4882a593Smuzhiyun 35*4882a593Smuzhiyun 36*4882a593Smuzhiyun-inline int insert(double x, double *array, unsigned int startVal) { 37*4882a593Smuzhiyun+static inline int insert(double x, double *array, unsigned int startVal) { 38*4882a593Smuzhiyun uint d = (startVal + 1) / 2; 39*4882a593Smuzhiyun uint i = startVal; 40*4882a593Smuzhiyun while (d > 0) { 41*4882a593Smuzhiyundiff --git a/libdieharder/dab_filltree2.c b/libdieharder/dab_filltree2.c 42*4882a593Smuzhiyunindex 1e33af2..59cbd52 100644 43*4882a593Smuzhiyun--- a/libdieharder/dab_filltree2.c 44*4882a593Smuzhiyun+++ b/libdieharder/dab_filltree2.c 45*4882a593Smuzhiyun@@ -92,7 +92,7 @@ static double targetData[128] = { // size=128, generated from 6e9 samples 46*4882a593Smuzhiyun 0.00000000000e+00,0.00000000000e+00,0.00000000000e+00,0.00000000000e+00, 47*4882a593Smuzhiyun }; 48*4882a593Smuzhiyun 49*4882a593Smuzhiyun-inline int insertBit(uint x, uchar *array, uint *i, uint *d); 50*4882a593Smuzhiyun+static inline int insertBit(uint x, uchar *array, uint *i, uint *d); 51*4882a593Smuzhiyun 52*4882a593Smuzhiyun int dab_filltree2(Test **test, int irun) { 53*4882a593Smuzhiyun int size = (ntuple == 0) ? 128 : ntuple; 54*4882a593Smuzhiyun@@ -181,7 +181,7 @@ int dab_filltree2(Test **test, int irun) { 55*4882a593Smuzhiyun * The function returns >= 0 if the path went too deep; the 56*4882a593Smuzhiyun * returned value is the last position of the path. 57*4882a593Smuzhiyun */ 58*4882a593Smuzhiyun-inline int insertBit(uint x, uchar *array, uint *i, uint *d) { 59*4882a593Smuzhiyun+static inline int insertBit(uint x, uchar *array, uint *i, uint *d) { 60*4882a593Smuzhiyun if (x != 0) { 61*4882a593Smuzhiyun *i += *d; 62*4882a593Smuzhiyun } else { 63*4882a593Smuzhiyun-- 64*4882a593Smuzhiyun2.13.2 65*4882a593Smuzhiyun 66