summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Bigliardi <shammash@artha.org>2009-03-15 14:04:41 (GMT)
committer Luca Bigliardi <shammash@artha.org>2009-03-15 14:06:23 (GMT)
commit8fdc5dfcaf13e2b5cf20aeb75f3d533d7155b923 (patch)
tree219e9aaa949c792e2ded566c9b40667ccad875f9
parent7bc33ef41e6853ea6447c36882b197bd7e2bb3ed (diff)
Non executable stack always defined.debian-orig-freej-0.10git20090312-1
Move non-executable stack info outside conditional compilation.
-rw-r--r--lib/ccvt/ccvt_mmx.S11
-rw-r--r--lib/ccvt/ccvt_rgb2yuv.S9
2 files changed, 11 insertions, 9 deletions
diff --git a/lib/ccvt/ccvt_mmx.S b/lib/ccvt/ccvt_mmx.S
index d409f60..7687ac3 100644
--- a/lib/ccvt/ccvt_mmx.S
+++ b/lib/ccvt/ccvt_mmx.S
@@ -20,6 +20,12 @@
*/
#include <config.h>
+
+/* non executable stack */
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+
#if defined HAVE_MMX && !defined HAVE_64BIT
/* The ccvt_* functions always have 4 paramaters:
@@ -47,11 +53,6 @@
#define Uptr -4(%ebp)
#define Vptr -8(%ebp)
-/* non executable stack */
-#if defined(__linux__) && defined(__ELF__)
-.section .note.GNU-stack,"",%progbits
-#endif
-
.data
.text
diff --git a/lib/ccvt/ccvt_rgb2yuv.S b/lib/ccvt/ccvt_rgb2yuv.S
index e1ae856..e38cdfb 100644
--- a/lib/ccvt/ccvt_rgb2yuv.S
+++ b/lib/ccvt/ccvt_rgb2yuv.S
@@ -20,6 +20,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <config.h>
+/* non executable stack */
+#if defined(__linux__) && defined(__ELF__)
+.section .note.GNU-stack,"",%progbits
+#endif
+
#if defined HAVE_MMX && !defined HAVE_64BIT
/* The ccvt_* functions always start with width and height, so these
@@ -62,10 +67,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define Uptr -68(%ebp)
#define Vptr -72(%ebp)
-/* non executable stack */
-#if defined(__linux__) && defined(__ELF__)
-.section .note.GNU-stack,"",%progbits
-#endif
.text
/* This function will load the src and destination pointers, including