[patch] avoid -Wa,--execstack

libpng-noexec.patch (text/plain), 1.30 KB, created by SpanKY on 2013-04-10 18:42:35 UTC

--- a/arm/filter_neon.S
+++ b/arm/filter_neon.S
@@ -16,11 +16,11 @@
 #define PNG_VERSION_INFO_ONLY
 #include "../pngpriv.h"
 
-#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \
-   defined(__ARM_NEON__)
 #if defined(__linux__) && defined(__ELF__)
 .section .note.GNU-stack,"",%progbits /* mark stack as non-executable */
 #endif
+#if defined(PNG_FILTER_OPTIMIZATIONS) && defined(__arm__) && \
+   defined(__ARM_NEON__)
 
 #ifdef __ELF__
 #   define ELF
--- a/configure.ac
+++ b/configure.ac
@@ -166,11 +166,6 @@ AC_ARG_WITH(binconfigs,
 	[binconfigs='${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],
    AS_HELP_STRING([[[--enable-arm-neon]]],
       [Enable ARM NEON optimizations: =off, check, api, on:]
--- a/configure
+++ b/configure
@@ -12812,7 +12812,7 @@ fi
 # 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)
-AM_CCASFLAGS=-Wa,--noexecstack
+AM_CCASFLAGS=
 
 
 # Check whether --enable-arm-neon was given.