diff --git a/makefile b/makefile index ac53541b..3b448d64 100644 --- a/makefile +++ b/makefile @@ -198,7 +198,7 @@ ${bd}/%.o: src/jit/%.c @echo $< | cut -c 5- @$(CC_INC) $@.d -o $@ -c $< -builtins: ${addprefix ${bd}/, arithm.o arithd.o cmp.o sfns.o squeeze.o select.o slash.o constrep.o group.o sort.o selfsearch.o nescan.o md1.o md2.o fns.o sysfn.o internal.o inverse.o} +builtins: ${addprefix ${bd}/, arithm.o arithd.o cmp.o sfns.o squeeze.o select.o slash.o group.o sort.o selfsearch.o md1.o md2.o fns.o sysfn.o internal.o inverse.o} ${bd}/%.o: src/builtins/%.c @echo $< | cut -c 5- @$(CC_INC) $@.d -o $@ -c $< diff --git a/src/builtins/constrep.c b/src/builtins/constrep.c deleted file mode 100644 index 2d22cfec..00000000 --- a/src/builtins/constrep.c +++ /dev/null @@ -1,6 +0,0 @@ -#if SINGELI - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-variable" - #include "../singeli/gen/constrep.c" - #pragma GCC diagnostic pop -#endif diff --git a/src/builtins/md1.c b/src/builtins/md1.c index 60992716..f3787916 100644 --- a/src/builtins/md1.c +++ b/src/builtins/md1.c @@ -109,7 +109,10 @@ B each_c2(Md1D* d, B w, B x) { B f = d->f; } #if SINGELI -extern void (*const clmul_scan_ne)(uint64_t v0,uint64_t* v1,uint64_t* v2,uint64_t v3); + #pragma GCC diagnostic push + #pragma GCC diagnostic ignored "-Wunused-variable" + #include "../singeli/gen/neq.c" + #pragma GCC diagnostic pop #endif B scan_ne(u64 p, u64* xp, u64 ia) { u64* rp; B r=m_bitarrv(&rp,ia); diff --git a/src/builtins/nescan.c b/src/builtins/nescan.c deleted file mode 100644 index b0d60751..00000000 --- a/src/builtins/nescan.c +++ /dev/null @@ -1,6 +0,0 @@ -#if SINGELI - #pragma GCC diagnostic push - #pragma GCC diagnostic ignored "-Wunused-variable" - #include "../singeli/gen/neq.c" - #pragma GCC diagnostic pop -#endif diff --git a/src/builtins/slash.c b/src/builtins/slash.c index d80dab81..f67ca784 100644 --- a/src/builtins/slash.c +++ b/src/builtins/slash.c @@ -105,19 +105,19 @@ #endif #if SINGELI -extern void (*const avx2_scan_pluswrap_u8)(uint8_t* v0,uint8_t* v1,uint64_t v2,uint8_t v3); -extern void (*const avx2_scan_pluswrap_u16)(uint16_t* v0,uint16_t* v1,uint64_t v2,uint16_t v3); -extern void (*const avx2_scan_pluswrap_u32)(uint32_t* v0,uint32_t* v1,uint64_t v2,uint32_t v3); -#define avx2_scan_pluswrap_u64(V0,V1,V2,V3) for (usz i=k; i