[libpng15] Revised stack marking in arm/filter_neon.S and configure.ac

This commit is contained in:
Glenn Randers-Pehrson 2013-04-23 08:59:38 -05:00
parent cdede7664e
commit 880636292c
4 changed files with 10 additions and 12 deletions

View File

@ -1,5 +1,5 @@
Libpng 1.5.16beta01 - April 13, 2013 Libpng 1.5.16beta01 - April 23, 2013
This is not intended to be a public release. It will be replaced This is not intended to be a public release. It will be replaced
within a few weeks by a public version or by another test version. within a few weeks by a public version or by another test version.
@ -26,9 +26,10 @@ Other information:
Changes since the last public release (1.5.15): Changes since the last public release (1.5.15):
Version 1.5.16beta01 [April 13, 2013] Version 1.5.16beta01 [April 23, 2013]
Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c
(Flavio Medeiros). (Flavio Medeiros).
Revised stack marking in arm/filter_neon.S and configure.ac
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -4070,9 +4070,10 @@ Version 1.5.15rc01 [March 21, 2013]
Version 1.5.15 [March 28, 2013] Version 1.5.15 [March 28, 2013]
No changes. No changes.
Version 1.5.16beta01 [April 13, 2013] Version 1.5.16beta01 [April 23, 2013]
Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c Corrected a misplaced closing bracket in contrib/libtests/pngvalid.c
(Flavio Medeiros). (Flavio Medeiros).
Revised stack marking in arm/filter_neon.S and configure.ac
Send comments/corrections/commendations to png-mng-implement at lists.sf.net Send comments/corrections/commendations to png-mng-implement at lists.sf.net
(subscription required; visit (subscription required; visit

View File

@ -1,9 +1,9 @@
/* filter_neon.S - NEON optimised filter functions /* filter_neon.S - NEON optimised filter functions
* *
* Copyright (c) 2011 Glenn Randers-Pehrson * Copyright (c) 2013 Glenn Randers-Pehrson
* Written by Mans Rullgard, 2011. * Written by Mans Rullgard, 2011.
* Last changed in libpng 1.5.7 [December 15, 2011] * Last changed in libpng 1.5.16 [%RDATE%]
* *
* This code is released under the libpng license. * This code is released under the libpng license.
* For conditions of distribution and use, see the disclaimer * For conditions of distribution and use, see the disclaimer
@ -16,12 +16,13 @@
#define PNG_VERSION_INFO_ONLY #define PNG_VERSION_INFO_ONLY
#include "../pngpriv.h" #include "../pngpriv.h"
#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \
defined(__ARM_NEON__)
#if defined(__linux__) && defined(__ELF__) #if defined(__linux__) && defined(__ELF__)
.section .note.GNU-stack,"",%progbits /* mark stack as non-executable */ .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
#endif #endif
#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \
defined(__ARM_NEON__)
#ifdef __ELF__ #ifdef __ELF__
# define ELF # define ELF
#else #else

View File

@ -166,11 +166,6 @@ AC_ARG_WITH(binconfigs,
[binconfigs='${binconfigs}']) [binconfigs='${binconfigs}'])
AC_SUBST([binconfigs]) AC_SUBST([binconfigs])
# Because GCC by default assembles code with an executable stack, even though it
# compiles C code with a non-executable stack, it is necessary to do a fixup
# here (this may by GCC specific)
AC_SUBST([AM_CCASFLAGS], [-Wa,--noexecstack])
AC_ARG_ENABLE([arm-neon], AC_ARG_ENABLE([arm-neon],
AS_HELP_STRING([[[--enable-arm-neon]]], AS_HELP_STRING([[[--enable-arm-neon]]],
[Enable ARM NEON optimizations: =off, check, api, on:] [Enable ARM NEON optimizations: =off, check, api, on:]