[libpng16] Cleaned up ARM NEON compilation handling. The tests are now in

pngpriv.h and detect the broken GCC compilers.
This commit is contained in:
John Bowler
2013-10-18 15:28:00 -05:00
committed by Glenn Randers-Pehrson
parent 9e9977e153
commit db9d96840d
5 changed files with 37 additions and 8 deletions

View File

@@ -22,9 +22,10 @@
/* Assembler NEON support - only works for 32-bit ARM (i.e. it does not work for
* ARM64). The code in arm/filter_neon_intrinsics.c supports ARM64, however it
* only works if -mfpu=neon is specified on the GCC command line.
* only works if -mfpu=neon is specified on the GCC command line. See pngpriv.h
* for the logic which sets PNG_USE_ARM_NEON_ASM:
*/
#ifndef __ARM_NEON__ /* else use arm/filter_neon_intrinsics.c */
#ifdef PNG_USE_ARM_NEON_ASM /* else use arm/filter_neon_intrinsics.c */
#ifdef PNG_READ_SUPPORTED
#if PNG_ARM_NEON_OPT > 0
@@ -241,4 +242,4 @@ func png_read_filter_row_paeth3_neon, export=1
endfunc
#endif /* PNG_ARM_NEON_OPT > 0 */
#endif /* PNG_READ_SUPPORTED */
#endif /* !__ARM_NEON__ */
#endif /* PNG_USE_ARM_NEON_ASM */

View File

@@ -15,7 +15,7 @@
#include "pngpriv.h"
/* This code requires -mfpu=neon on the command line: */
#ifdef __ARM_NEON__ /* else use arm/filter_neon.S */
#ifndef PNG_USE_ARM_NEON_ASM /* else use arm/filter_neon.S */
#include <arm_neon.h>
@@ -369,4 +369,4 @@ png_read_filter_row_paeth4_neon(png_row_infop row_info, png_bytep row,
#endif /* PNG_ARM_NEON_OPT > 0 */
#endif /* PNG_READ_SUPPORTED */
#endif /* __ARM_NEON__ */
#endif /* !PNG_USE_ARM_NEON_ASM */