Allow for building the MIPS DSPr2 extensions if the host is mips-* as well as mipsel...

git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1316 632fc199-4ca6-4c93-a231-07263d6284db

diff --git a/acinclude.m4 b/acinclude.m4
index 40a9e52fa3195aa454bac48e791dbf2d7960d9cc..8d6678495225cd91dc390b966a2ea83a53214255 100644 (file)
--- 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 53f7e30237a562f01087d5e2982d9203201f9a8e..d2de185292bf95b280ca992aa0922d4de1f108e1 100644 (file)
--- 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 f4d44c3bf4d82cbbc5935b6c882f8607cb34c47f..72d6366a4093e4942b44857e0eda044213c2df0f 100644 (file)
--- 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 2a1059e0ea2834f7d9c99d1f7488e02338326dcf..e95023a2bc3a57e44f55ed5e16b9b0624df18107 100644 (file)
--- 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