X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/blobdiff_plain/ac82eac807a9818e676c316f8afeab5cff2572cd..HEAD:/math/Makefile.am

diff --git a/math/Makefile.am b/math/Makefile.am
index dd48057a..26e6d91b 100644
--- a/math/Makefile.am
+++ b/math/Makefile.am
@@ -100,6 +100,8 @@ libmath_la_SOURCES	+= mp-modsqrt.c
 TESTS			+= mp-modsqrt.t$(EXEEXT)
 libmath_la_SOURCES	+= mp-sqrt.c
 TESTS			+= mp-sqrt.t$(EXEEXT)
+libmath_la_SOURCES	+= mp-nthrt.c
+TESTS			+= mp-nthrt.t$(EXEEXT)
 libmath_la_SOURCES	+= mp-test.c
 EXTRA_DIST		+= t/mp
 
@@ -192,11 +194,22 @@ MPX_MUL4_SOURCES	 = mpx-mul4-amd64-sse2.S
 check_PROGRAMS		+= mpx-mul4.t
 TESTS			+= mpx-mul4.t$(EXEEXT)
 endif
+if CPUFAM_ARMEL
+MPX_MUL4_SOURCES	 = mpx-mul4-arm-neon.S
+check_PROGRAMS		+= mpx-mul4.t
+TESTS			+= mpx-mul4.t$(EXEEXT)
+endif
+if CPUFAM_ARM64
+MPX_MUL4_SOURCES	 = mpx-mul4-arm64-simd.S
+check_PROGRAMS		+= mpx-mul4.t
+TESTS			+= mpx-mul4.t$(EXEEXT)
+endif
 libmath_la_SOURCES	+= $(MPX_MUL4_SOURCES)
 mpx_mul4_t_SOURCES	 = mpx-mul4-test.c $(MPX_MUL4_SOURCES)
 mpx_mul4_t_CPPFLAGS	 = \
 	$(AM_CPPFLAGS) \
 	-DTEST_MUL4 -DSRCDIR="\"$(srcdir)\""
+mpx_mul4_t_LDFLAGS	 = $(TEST_LDFLAGS)
 mpx_mul4_t_LDADD	 = $(top_builddir)/libcatacomb.la $(mLib_LIBS)
 EXTRA_DIST		+= t/mpx-mul4
 
@@ -305,17 +318,6 @@ TESTS			+= gfx.t$(EXEEXT)
 libmath_la_SOURCES	+= gfx-kmul.c
 TESTS			+= gfx-kmul.t$(EXEEXT)
 libmath_la_SOURCES	+= gfx-sqr.c
-nodist_libmath_la_SOURCES += ../precomp/math/gfx-sqrtab.c
-PRECOMPS		+= $(precomp)/math/gfx-sqrtab.c
-PRECOMP_PROGS		+= gfx-sqr-mktab
-if !CROSS_COMPILING
-$(precomp)/math/gfx-sqrtab.c:
-	$(AM_V_at)$(MKDIR_P) $(precomp)/math
-	$(AM_V_at)$(MAKE) gfx-sqr-mktab$(EXEEXT)
-	$(AM_V_GEN)./gfx-sqr-mktab >$(precomp)/math/gfx-sqrtab.c.new && \
-		mv $(precomp)/math/gfx-sqrtab.c.new \
-			$(precomp)/math/gfx-sqrtab.c
-endif
 TESTS			+= gfx-sqr.t$(EXEEXT)
 EXTRA_DIST		+= t/gfx
 
@@ -429,6 +431,7 @@ check_PROGRAMS		+= f25519-p10.t
 f25519_p10_t_SOURCES	 = f25519.c
 f25519_p10_t_CPPFLAGS	 = $(AM_CPPFLAGS) -DTEST_RIG -DSRCDIR="\"$(srcdir)\""
 f25519_p10_t_CPPFLAGS	+= -DF25519_IMPL=10
+f25519_p10_t_LDFLAGS	 = $(TEST_LDFLAGS)
 f25519_p10_t_LDADD	 = $(TEST_LIBS) $(top_builddir)/libcatacomb.la
 f25519_p10_t_LDADD	+= $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)
 
@@ -442,6 +445,7 @@ check_PROGRAMS		+= fgoldi-p12.t
 fgoldi_p12_t_SOURCES	 = fgoldi.c
 fgoldi_p12_t_CPPFLAGS	 = $(AM_CPPFLAGS) -DTEST_RIG -DSRCDIR="\"$(srcdir)\""
 fgoldi_p12_t_CPPFLAGS	+= -DFGOLDI_IMPL=12
+fgoldi_p12_t_LDFLAGS	 = $(TEST_LDFLAGS)
 fgoldi_p12_t_LDADD	 = $(TEST_LIBS) $(top_builddir)/libcatacomb.la
 fgoldi_p12_t_LDADD	+= $(mLib_LIBS) $(CATACOMB_LIBS) $(LIBS)