Enable MIPS64 asm in CI

3 files changed, 9 insertions, 8 deletions

diff --git a/configure.ac b/configure.ac
index c10a33f..12703dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -94,7 +94,7 @@ AS_CASE([$host_cpu],
         [*arm*], [host_cpu=arm],
         [*amd64*], [host_cpu=x86_64 HOSTARCH=intel],
         [i?86], [host_cpu=i386 HOSTARCH=intel enable_asm=no],
-        [mips64*], [host_cpu=mips64 enable_asm=no],
+        [mips64*], [host_cpu=mips64 enable_asm=${enable_asm-no}],
         [mips*], [host_cpu=mips enable_asm=no],
         [powerpc*], [host_cpu=powerpc],
         [ppc64*], [host_cpu=powerpc64],
diff --git a/crypto/Makefile.am.elf-mips64 b/crypto/Makefile.am.elf-mips64
index c6727b3..7269d6e 100644
--- a/crypto/Makefile.am.elf-mips64
+++ b/crypto/Makefile.am.elf-mips64
@@ -1,9 +1,9 @@
-ASM_MIPS64_ELF = aes/aes-mips.S
-ASM_MIPS64_ELF += bn/bn-mips.S
-ASM_MIPS64_ELF += bn/mont-mips.S
-ASM_MIPS64_ELF += sha/sha1-mips.S
-ASM_MIPS64_ELF += sha/sha512-mips.S
-ASM_MIPS64_ELF += sha/sha256-mips.S
+ASM_MIPS64_ELF = aes/aes-mips64.S
+ASM_MIPS64_ELF += bn/bn-mips64.S
+ASM_MIPS64_ELF += bn/mont-mips64.S
+ASM_MIPS64_ELF += sha/sha1-mips64.S
+ASM_MIPS64_ELF += sha/sha512-mips64.S
+ASM_MIPS64_ELF += sha/sha256-mips64.S
 
 EXTRA_DIST += $(ASM_MIPS64_ELF)
 
diff --git a/scripts/test b/scripts/test
index 2cff531..6d573e3 100755
--- a/scripts/test
+++ b/scripts/test
@@ -182,7 +182,8 @@ elif [ "$ARCH" = "mips32" ] || [ "$ARCH" = "mips64" ]; then
                 sudo ln -sf /usr/mips64el-linux-gnuabi64/lib64/ld.so.1 /lib64
                 setup_cross_compiler mips64el-linux-gnuabi64
 
-                ./configure --host=mips64el-linux-gnuabi64
+                # MIPS assembly is disabled by default, so enable it for CI coverage.
+                ./configure --host=mips64el-linux-gnuabi64 --enable-asm
                 LD_LIBRARY_PATH=/usr/mips64el-linux-gnuabi64/lib make -j 4 check
         fi