[PATCH 2/2] Add libgnu to libpoke

[Tim Rühsen]

2020-05-03  Tim Rühsen  <address@hidden>

        * libpoke/Makefile.am: Add libgnu.la to libpoke_la_LIBADD.
        * libpoke/pkl-fold.c: Use fold_gcd instead gcd.
---
 ChangeLog           | 5 +++++
 libpoke/Makefile.am | 2 +-
 libpoke/pkl-fold.c  | 4 ++--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e65a7359..eba484f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2020-05-03  Tim Rühsen  <address@hidden>
+
+       * libpoke/Makefile.am: Add libgnu.la to libpoke_la_LIBADD.
+       * libpoke/pkl-fold.c: Use fold_gcd instead gcd.
+
 2020-05-02  Tim Rühsen  <address@hidden>

        * libpoke/libpoke.h: Remove include of pk-utils.h.
diff --git a/libpoke/Makefile.am b/libpoke/Makefile.am
index b39952c5..4fce30cd 100644
--- a/libpoke/Makefile.am
+++ b/libpoke/Makefile.am
@@ -81,7 +81,7 @@ libpoke_la_CPPFLAGS = -I$(top_builddir)/gl -I$(top_srcdir)/gl 
\
                       -DPKGINFODIR=\"$(infodir)\" \
                       -DLOCALEDIR=\"$(localedir)\"
 libpoke_la_CFLAGS = -Wall $(BDW_GC_CFLAGS) $(LIBNBD_CFLAGS)
-libpoke_la_LIBADD = libpokeutils.la libpvmjitter.la \
+libpoke_la_LIBADD = ../gl/libgnu.la libpokeutils.la libpvmjitter.la \
                     $(BDW_GC_LIBS) \
                     $(LIBNBD_LIBS)
 libpoke_la_LDFLAGS =
diff --git a/libpoke/pkl-fold.c b/libpoke/pkl-fold.c
index c6118d23..64feffdb 100644
--- a/libpoke/pkl-fold.c
+++ b/libpoke/pkl-fold.c
@@ -35,7 +35,7 @@

 /* Roll out our own GCD from gnulib.  */
 #define WORD_T uint64_t
-#define GCD gcd
+#define GCD fold_gcd
 #include <gcd.c>

 #define PKL_FOLD_PAYLOAD ((pkl_fold_payload) PKL_PASS_PAYLOAD)
@@ -127,7 +127,7 @@ EMUL_III (le) { return op1 <= op2; }
 EMUL_UUU (ge) { return op1 >= op2; }
 EMUL_III (ge) { return op1 >= op2; }

-EMUL_UUU (gcd) { return gcd (op1, op2); }
+EMUL_UUU (gcd) { return fold_gcd (op1, op2); }
 EMUL_III (gcd) { assert (0); return 0; }

 EMUL_UUU (sl) { return op1 << op2; }
--
2.26.2