diff --git a/acinclude.m4 b/acinclude.m4 index 40a9e52f..8d667849 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -184,7 +184,7 @@ AC_DEFUN([AC_CHECK_COMPATIBLE_ARM_ASSEMBLER_IFELSE],[ # AC_CHECK_COMPATIBLE_MIPSEL_ASSEMBLER_IFELSE # -------------------------- # Test whether the assembler is suitable and supports MIPS instructions -AC_DEFUN([AC_CHECK_COMPATIBLE_MIPSEL_ASSEMBLER_IFELSE],[ +AC_DEFUN([AC_CHECK_COMPATIBLE_MIPS_ASSEMBLER_IFELSE],[ have_mips_dspr2=no ac_save_CFLAGS="$CFLAGS" CFLAGS="$CCASFLAGS -mdspr2" diff --git a/configure.ac b/configure.ac index 53f7e302..d2de1852 100644 --- a/configure.ac +++ b/configure.ac @@ -441,12 +441,12 @@ if test "x${with_simd}" != "xno"; then fi fi ;; - mipsel*) - AC_MSG_RESULT([yes (mipsel)]) + mips*) + AC_MSG_RESULT([yes (mips)]) AC_MSG_CHECKING([if the assembler is GNU-compatible and can be used]) - AC_CHECK_COMPATIBLE_MIPSEL_ASSEMBLER_IFELSE( + AC_CHECK_COMPATIBLE_MIPS_ASSEMBLER_IFELSE( [AC_MSG_RESULT([yes]) - simd_arch=mipsel], + simd_arch=mips], [AC_MSG_RESULT([no]) with_simd=no]) if test "x${with_simd}" = "xno"; then @@ -481,7 +481,7 @@ AM_CONDITIONAL([SIMD_I386], [test "x$simd_arch" = "xi386"]) AM_CONDITIONAL([SIMD_X86_64], [test "x$simd_arch" = "xx86_64"]) AM_CONDITIONAL([SIMD_ARM], [test "x$simd_arch" = "xarm"]) AM_CONDITIONAL([SIMD_ARM_64], [test "x$simd_arch" = "xaarch64"]) -AM_CONDITIONAL([SIMD_MIPSEL], [test "x$simd_arch" = "xmipsel"]) +AM_CONDITIONAL([SIMD_MIPS], [test "x$simd_arch" = "xmips"]) AM_CONDITIONAL([X86_64], [test "x$host_cpu" = "xx86_64" -o "x$host_cpu" = "xamd64"]) AM_CONDITIONAL([WITH_TURBOJPEG], [test "x$with_turbojpeg" != "xno"]) diff --git a/simd/Makefile.am b/simd/Makefile.am index f4d44c3b..72d6366a 100644 --- a/simd/Makefile.am +++ b/simd/Makefile.am @@ -64,7 +64,7 @@ libsimd_la_SOURCES = jsimd_arm64.c jsimd_arm_neon_64.S endif -if SIMD_MIPSEL +if SIMD_MIPS libsimd_la_SOURCES = jsimd_mips.c jsimd_mips_dspr2_asm.h jsimd_mips_dspr2.S diff --git a/simd/jsimd_mips.c b/simd/jsimd_mips.c index 2a1059e0..e95023a2 100644 --- a/simd/jsimd_mips.c +++ b/simd/jsimd_mips.c @@ -67,7 +67,7 @@ init_simd (void) simd_support = 0; -#if defined(__mips__) && defined(__mips_dsp) && (__mips_dsp_rev >= 2) +#if defined(__MIPSEL__) && defined(__mips_dsp) && (__mips_dsp_rev >= 2) simd_support |= JSIMD_MIPS_DSPR2; #elif defined(__linux__) /* We still have a chance to use MIPS DSPR2 regardless of globally used