0004-Add-static-to-inline-functions.patch 2.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465
  1. From 9c71a211dcf20f53f747326f5bc3fee9fabe3f52 Mon Sep 17 00:00:00 2001
  2. From: Julien Viard de Galbert <julien@vdg.name>
  3. Date: Tue, 27 Jun 2017 00:16:11 +0200
  4. Subject: [PATCH] Add static to inline functions
  5. This is needed to avoid a link error where the inline functions appear
  6. missing at link time.
  7. From c99 standard inline function should either be declared static or
  8. have an extern instance in a c file for linking.
  9. This fix is necessary to build with gcc 7; for some reason it was not
  10. trigerred before.
  11. Signed-off-by: Julien Viard de Galbert <julien@vdg.name>
  12. ---
  13. libdieharder/dab_filltree.c | 4 ++--
  14. libdieharder/dab_filltree2.c | 4 ++--
  15. 2 files changed, 4 insertions(+), 4 deletions(-)
  16. diff --git a/libdieharder/dab_filltree.c b/libdieharder/dab_filltree.c
  17. index 9cc5ce7..a377c3d 100644
  18. --- a/libdieharder/dab_filltree.c
  19. +++ b/libdieharder/dab_filltree.c
  20. @@ -34,7 +34,7 @@ static double targetData[] = {
  21. 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
  22. };
  23. -inline int insert(double x, double *array, unsigned int startVal);
  24. +static inline int insert(double x, double *array, unsigned int startVal);
  25. int dab_filltree(Test **test,int irun) {
  26. int size = (ntuple == 0) ? 32 : ntuple;
  27. @@ -105,7 +105,7 @@ int dab_filltree(Test **test,int irun) {
  28. }
  29. -inline int insert(double x, double *array, unsigned int startVal) {
  30. +static inline int insert(double x, double *array, unsigned int startVal) {
  31. uint d = (startVal + 1) / 2;
  32. uint i = startVal;
  33. while (d > 0) {
  34. diff --git a/libdieharder/dab_filltree2.c b/libdieharder/dab_filltree2.c
  35. index 1e33af2..59cbd52 100644
  36. --- a/libdieharder/dab_filltree2.c
  37. +++ b/libdieharder/dab_filltree2.c
  38. @@ -92,7 +92,7 @@ static double targetData[128] = { // size=128, generated from 6e9 samples
  39. 0.00000000000e+00,0.00000000000e+00,0.00000000000e+00,0.00000000000e+00,
  40. };
  41. -inline int insertBit(uint x, uchar *array, uint *i, uint *d);
  42. +static inline int insertBit(uint x, uchar *array, uint *i, uint *d);
  43. int dab_filltree2(Test **test, int irun) {
  44. int size = (ntuple == 0) ? 128 : ntuple;
  45. @@ -181,7 +181,7 @@ int dab_filltree2(Test **test, int irun) {
  46. * The function returns >= 0 if the path went too deep; the
  47. * returned value is the last position of the path.
  48. */
  49. -inline int insertBit(uint x, uchar *array, uint *i, uint *d) {
  50. +static inline int insertBit(uint x, uchar *array, uint *i, uint *d) {
  51. if (x != 0) {
  52. *i += *d;
  53. } else {
  54. --
  55. 2.13.2