ryan/mozjpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix regression introduced in r1122 that caused SIMD detection to malfunction for ARM platforms (and probably ARM64 and MIPS as well.)

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/libjpeg-turbo/code/trunk@1134 632fc199-4ca6-4c93-a231-07263d6284db
This commit is contained in:
DRC
2014-03-06 09:26:49 +00:00
parent 895fd6d0d3
commit f9c2dd2684
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
acinclude.m4
View File

@@ -144,26 +144,26 @@ AC_DEFUN([AC_CHECK_COMPATIBLE_ARM_ASSEMBLER_IFELSE],[
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CCASFLAGS -x assembler-with-cpp" CFLAGS="$CCASFLAGS -x assembler-with-cpp"
CC="$CCAS" CC="$CCAS"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
.text .text
.fpu neon .fpu neon
.arch armv7a .arch armv7a
.object_arch armv4 .object_arch armv4
.arm .arm
pld [r0] pld [r0]
vmovn.u16 d0, q0])], ac_good_gnu_arm_assembler=yes) vmovn.u16 d0, q0]])], ac_good_gnu_arm_assembler=yes)
ac_use_gas_preprocessor=no ac_use_gas_preprocessor=no
if test "x$ac_good_gnu_arm_assembler" = "xno" ; then if test "x$ac_good_gnu_arm_assembler" = "xno" ; then
CC="gas-preprocessor.pl $CCAS" CC="gas-preprocessor.pl $CCAS"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
.text .text
.fpu neon .fpu neon
.arch armv7a .arch armv7a
.object_arch armv4 .object_arch armv4
.arm .arm
pld [r0] pld [r0]
vmovn.u16 d0, q0])], ac_use_gas_preprocessor=yes) vmovn.u16 d0, q0]])], ac_use_gas_preprocessor=yes)
fi fi
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
CC="$ac_save_CC" CC="$ac_save_CC"
@@ -189,7 +189,7 @@ AC_DEFUN([AC_CHECK_COMPATIBLE_MIPSEL_ASSEMBLER_IFELSE],[
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CCASFLAGS -mdspr2" CFLAGS="$CCASFLAGS -mdspr2"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
int main () int main ()
{ {
@@ -201,7 +201,7 @@ AC_DEFUN([AC_CHECK_COMPATIBLE_MIPSEL_ASSEMBLER_IFELSE],[
); );
return c; return c;
} }
])], have_mips_dspr2=yes) ]])], have_mips_dspr2=yes)
CFLAGS=$ac_save_CFLAGS CFLAGS=$ac_save_CFLAGS
if test "x$have_mips_dspr2" = "xyes" ; then if test "x$have_mips_dspr2" = "xyes" ; then
@@ -217,16 +217,16 @@ AC_DEFUN([AC_CHECK_COMPATIBLE_ARM64_ASSEMBLER_IFELSE],[
ac_save_CFLAGS="$CFLAGS" ac_save_CFLAGS="$CFLAGS"
CFLAGS="$CCASFLAGS -x assembler-with-cpp" CFLAGS="$CCASFLAGS -x assembler-with-cpp"
CC="$CCAS" CC="$CCAS"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
.text .text
movi v0.16b, [#100]])], ac_good_gnu_arm_assembler=yes) movi v0.16b, #100]])], ac_good_gnu_arm_assembler=yes)
ac_use_gas_preprocessor=no ac_use_gas_preprocessor=no
if test "x$ac_good_gnu_arm_assembler" = "xno" ; then if test "x$ac_good_gnu_arm_assembler" = "xno" ; then
CC="gas-preprocessor.pl $CCAS" CC="gas-preprocessor.pl $CCAS"
AC_COMPILE_IFELSE([AC_LANG_SOURCE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
.text .text
movi v0.16b, [#100]])], ac_use_gas_preprocessor=yes) movi v0.16b, #100]])], ac_use_gas_preprocessor=yes)
fi fi
CFLAGS="$ac_save_CFLAGS" CFLAGS="$ac_save_CFLAGS"
CC="$ac_save_CC" CC="$ac_save_CC"