[XviD-devel] [PATCH resend] make the stack non-executable on x86_64 too
Michal Schmidt
mschmidt at redhat.com
Wed Sep 16 13:37:01 CEST 2009
[resend, my yesterday's post does not seem to have made it to the list]
Since version 1.2.0 xvidcore is supposed to have non-executable stack,
but in fact it still ends up executable as evidenced by:
https://bugzilla.rpmfusion.org/show_bug.cgi?id=743
https://bugzilla.rpmfusion.org/show_bug.cgi?id=777
This can be easily verified:
$ readelf -l /usr/lib64/libxvidcore.so.4 | grep -A1 GNU_STACK
GNU_STACK 0x0000000000000000 0x0000000000000000
0x0000000000000000 0x0000000000000000 0x0000000000000000 RWE 8
The 'E' in 'RWE' means the stack is Executable.
One bug is that on x86_64 the __OUTPUT_FORMAT__ is 'elf64', not
'elf', so the .note.GNU-stack sections are not inserted.
Another bug is that the section name is quoted and the quotes are
interpreted as a part of the name (this can be checked using readelf -S
on the object files). ld then can't find the .note.GNU-stack sections
and assumes executable stack.
Fix it by defining a NON_EXEC_STACK macro and using it in the *.asm
sources.
Michal
---
Index: src/nasm.inc
===================================================================
RCS file: /xvid/xvidcore/src/nasm.inc,v
retrieving revision 1.6
diff -u -r1.6 nasm.inc
--- src/nasm.inc 5 Dec 2008 10:15:02 -0000 1.6
+++ src/nasm.inc 15 Sep 2009 12:43:18 -0000
@@ -203,3 +203,12 @@
%endif
%endif
%endmacro
+
+%macro NON_EXEC_STACK 0
+%ifidn __OUTPUT_FORMAT__,elf
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+%ifidn __OUTPUT_FORMAT__,elf64
+section .note.GNU-stack noalloc noexec nowrite progbits
+%endif
+%endmacro
Index: src/bitstream/x86_asm/cbp_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/bitstream/x86_asm/cbp_mmx.asm,v
retrieving revision 1.18
diff -u -r1.18 cbp_mmx.asm
--- src/bitstream/x86_asm/cbp_mmx.asm 4 Dec 2008 14:41:50 -0000 1.18
+++ src/bitstream/x86_asm/cbp_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -126,8 +126,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/bitstream/x86_asm/cbp_sse2.asm
===================================================================
RCS file: /xvid/xvidcore/src/bitstream/x86_asm/cbp_sse2.asm,v
retrieving revision 1.13
diff -u -r1.13 cbp_sse2.asm
--- src/bitstream/x86_asm/cbp_sse2.asm 4 Dec 2008 14:41:50 -0000 1.13
+++ src/bitstream/x86_asm/cbp_sse2.asm 15 Sep 2009 12:43:18 -0000
@@ -113,8 +113,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/dct/x86_asm/fdct_mmx_ffmpeg.asm
===================================================================
RCS file: /xvid/xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm,v
retrieving revision 1.9
diff -u -r1.9 fdct_mmx_ffmpeg.asm
--- src/dct/x86_asm/fdct_mmx_ffmpeg.asm 4 Dec 2008 14:41:50 -0000 1.9
+++ src/dct/x86_asm/fdct_mmx_ffmpeg.asm 15 Sep 2009 12:43:18 -0000
@@ -401,7 +401,4 @@
MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/dct/x86_asm/fdct_mmx_skal.asm
===================================================================
RCS file: /xvid/xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm,v
retrieving revision 1.11
diff -u -r1.11 fdct_mmx_skal.asm
--- src/dct/x86_asm/fdct_mmx_skal.asm 4 Dec 2008 14:41:50 -0000 1.11
+++ src/dct/x86_asm/fdct_mmx_skal.asm 15 Sep 2009 12:43:18 -0000
@@ -500,7 +500,4 @@
MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/dct/x86_asm/fdct_sse2_skal.asm
===================================================================
RCS file: /xvid/xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm,v
retrieving revision 1.14
diff -u -r1.14 fdct_sse2_skal.asm
--- src/dct/x86_asm/fdct_sse2_skal.asm 5 Dec 2008 10:33:47 -0000 1.14
+++ src/dct/x86_asm/fdct_sse2_skal.asm 15 Sep 2009 12:43:18 -0000
@@ -608,7 +608,4 @@
ALIGN SECTION_ALIGN
times 8 dw 0
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/dct/x86_asm/idct_3dne.asm
===================================================================
RCS file: /xvid/xvidcore/src/dct/x86_asm/idct_3dne.asm,v
retrieving revision 1.10
diff -u -r1.10 idct_3dne.asm
--- src/dct/x86_asm/idct_3dne.asm 4 Dec 2008 14:41:50 -0000 1.10
+++ src/dct/x86_asm/idct_3dne.asm 15 Sep 2009 12:43:18 -0000
@@ -698,8 +698,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/dct/x86_asm/idct_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/dct/x86_asm/idct_mmx.asm,v
retrieving revision 1.14
diff -u -r1.14 idct_mmx.asm
--- src/dct/x86_asm/idct_mmx.asm 4 Dec 2008 14:41:50 -0000 1.14
+++ src/dct/x86_asm/idct_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -608,8 +608,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/dct/x86_asm/idct_sse2_dmitry.asm
===================================================================
RCS file: /xvid/xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm,v
retrieving revision 1.10
diff -u -r1.10 idct_sse2_dmitry.asm
--- src/dct/x86_asm/idct_sse2_dmitry.asm 4 Dec 2008 14:41:50 -0000 1.10
+++ src/dct/x86_asm/idct_sse2_dmitry.asm 15 Sep 2009 12:43:18 -0000
@@ -325,8 +325,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/image/x86_asm/colorspace_rgb_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm,v
retrieving revision 1.12
diff -u -r1.12 colorspace_rgb_mmx.asm
--- src/image/x86_asm/colorspace_rgb_mmx.asm 13 May 2009 09:39:20 -0000 1.12
+++ src/image/x86_asm/colorspace_rgb_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -529,8 +529,4 @@
MAKE_COLORSPACE yv12_to_bgr_mmx,48, 3,8,2, YV12_TO_BGR, 3, -1
MAKE_COLORSPACE yv12_to_bgra_mmx,48, 4,8,2, YV12_TO_BGR, 4, -1
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/image/x86_asm/colorspace_yuv_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm,v
retrieving revision 1.14
diff -u -r1.14 colorspace_yuv_mmx.asm
--- src/image/x86_asm/colorspace_yuv_mmx.asm 4 Dec 2008 18:30:36 -0000 1.14
+++ src/image/x86_asm/colorspace_yuv_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -451,7 +451,4 @@
MAKE_YV12_TO_YV12 yv12_to_yv12_xmm, 1
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/image/x86_asm/colorspace_yuyv_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm,v
retrieving revision 1.11
diff -u -r1.11 colorspace_yuyv_mmx.asm
--- src/image/x86_asm/colorspace_yuyv_mmx.asm 4 Dec 2008 14:41:50 -0000 1.11
+++ src/image/x86_asm/colorspace_yuyv_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -341,7 +341,4 @@
MAKE_COLORSPACE yv12_to_yuyvi_mmx,0, 2,8,4, YV12_TO_YUYVI, 0, -1
MAKE_COLORSPACE yv12_to_uyvyi_mmx,0, 2,8,4, YV12_TO_YUYVI, 1, -1
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/image/x86_asm/deintl_sse.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/deintl_sse.asm,v
retrieving revision 1.5
diff -u -r1.5 deintl_sse.asm
--- src/image/x86_asm/deintl_sse.asm 4 Dec 2008 14:41:50 -0000 1.5
+++ src/image/x86_asm/deintl_sse.asm 15 Sep 2009 12:43:18 -0000
@@ -131,7 +131,4 @@
ENDFUNC
;//////////////////////////////////////////////////////////////////////
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
+NON_EXEC_STACK
Index: src/image/x86_asm/gmc_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/gmc_mmx.asm,v
retrieving revision 1.10
diff -u -r1.10 gmc_mmx.asm
--- src/image/x86_asm/gmc_mmx.asm 4 Dec 2008 14:41:50 -0000 1.10
+++ src/image/x86_asm/gmc_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -220,7 +220,4 @@
ENDFUNC
;//////////////////////////////////////////////////////////////////////
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
+NON_EXEC_STACK
Index: src/image/x86_asm/interpolate8x8_3dn.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm,v
retrieving revision 1.13
diff -u -r1.13 interpolate8x8_3dn.asm
--- src/image/x86_asm/interpolate8x8_3dn.asm 4 Dec 2008 14:41:50 -0000 1.13
+++ src/image/x86_asm/interpolate8x8_3dn.asm 15 Sep 2009 12:43:18 -0000
@@ -463,8 +463,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/image/x86_asm/interpolate8x8_3dne.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm,v
retrieving revision 1.13
diff -u -r1.13 interpolate8x8_3dne.asm
--- src/image/x86_asm/interpolate8x8_3dne.asm 4 Dec 2008 18:30:36 -0000 1.13
+++ src/image/x86_asm/interpolate8x8_3dne.asm 15 Sep 2009 12:43:18 -0000
@@ -563,8 +563,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/image/x86_asm/interpolate8x8_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm,v
retrieving revision 1.24
diff -u -r1.24 interpolate8x8_mmx.asm
--- src/image/x86_asm/interpolate8x8_mmx.asm 4 Dec 2008 14:41:50 -0000 1.24
+++ src/image/x86_asm/interpolate8x8_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -1323,8 +1323,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/image/x86_asm/interpolate8x8_xmm.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm,v
retrieving revision 1.14
diff -u -r1.14 interpolate8x8_xmm.asm
--- src/image/x86_asm/interpolate8x8_xmm.asm 4 Dec 2008 14:41:50 -0000 1.14
+++ src/image/x86_asm/interpolate8x8_xmm.asm 15 Sep 2009 12:43:18 -0000
@@ -819,8 +819,4 @@
EPILOG
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/image/x86_asm/postprocessing_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/postprocessing_mmx.asm,v
retrieving revision 1.12
diff -u -r1.12 postprocessing_mmx.asm
--- src/image/x86_asm/postprocessing_mmx.asm 4 Dec 2008 18:30:36 -0000 1.12
+++ src/image/x86_asm/postprocessing_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -114,7 +114,4 @@
ENDFUNC
;//////////////////////////////////////////////////////////////////////
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/image/x86_asm/postprocessing_sse2.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/postprocessing_sse2.asm,v
retrieving revision 1.15
diff -u -r1.15 postprocessing_sse2.asm
--- src/image/x86_asm/postprocessing_sse2.asm 4 Dec 2008 18:30:36 -0000 1.15
+++ src/image/x86_asm/postprocessing_sse2.asm 15 Sep 2009 12:43:18 -0000
@@ -128,7 +128,4 @@
ENDFUNC
;//////////////////////////////////////////////////////////////////////
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/image/x86_asm/qpel_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/qpel_mmx.asm,v
retrieving revision 1.10
diff -u -r1.10 qpel_mmx.asm
--- src/image/x86_asm/qpel_mmx.asm 4 Dec 2008 14:41:50 -0000 1.10
+++ src/image/x86_asm/qpel_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -1149,7 +1149,4 @@
%undef SRC_PTR
%undef DST_PTR
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/image/x86_asm/reduced_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/image/x86_asm/reduced_mmx.asm,v
retrieving revision 1.11
diff -u -r1.11 reduced_mmx.asm
--- src/image/x86_asm/reduced_mmx.asm 4 Dec 2008 14:41:50 -0000 1.11
+++ src/image/x86_asm/reduced_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -985,8 +985,4 @@
; pfeewwww... Never Do That On Stage Again. :)
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/motion/x86_asm/sad_3dn.asm
===================================================================
RCS file: /xvid/xvidcore/src/motion/x86_asm/sad_3dn.asm,v
retrieving revision 1.13
diff -u -r1.13 sad_3dn.asm
--- src/motion/x86_asm/sad_3dn.asm 4 Dec 2008 14:41:50 -0000 1.13
+++ src/motion/x86_asm/sad_3dn.asm 15 Sep 2009 12:43:18 -0000
@@ -216,8 +216,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/motion/x86_asm/sad_3dne.asm
===================================================================
RCS file: /xvid/xvidcore/src/motion/x86_asm/sad_3dne.asm,v
retrieving revision 1.11
diff -u -r1.11 sad_3dne.asm
--- src/motion/x86_asm/sad_3dne.asm 4 Dec 2008 14:41:50 -0000 1.11
+++ src/motion/x86_asm/sad_3dne.asm 15 Sep 2009 12:43:18 -0000
@@ -490,8 +490,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/motion/x86_asm/sad_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/motion/x86_asm/sad_mmx.asm,v
retrieving revision 1.21
diff -u -r1.21 sad_mmx.asm
--- src/motion/x86_asm/sad_mmx.asm 4 Dec 2008 14:41:50 -0000 1.21
+++ src/motion/x86_asm/sad_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -731,8 +731,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/motion/x86_asm/sad_sse2.asm
===================================================================
RCS file: /xvid/xvidcore/src/motion/x86_asm/sad_sse2.asm,v
retrieving revision 1.19
diff -u -r1.19 sad_sse2.asm
--- src/motion/x86_asm/sad_sse2.asm 4 Dec 2008 14:41:50 -0000 1.19
+++ src/motion/x86_asm/sad_sse2.asm 15 Sep 2009 12:43:18 -0000
@@ -172,8 +172,4 @@
MEAN16_SSE2_SSE3 lddqu
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/motion/x86_asm/sad_xmm.asm
===================================================================
RCS file: /xvid/xvidcore/src/motion/x86_asm/sad_xmm.asm,v
retrieving revision 1.14
diff -u -r1.14 sad_xmm.asm
--- src/motion/x86_asm/sad_xmm.asm 4 Dec 2008 14:41:50 -0000 1.14
+++ src/motion/x86_asm/sad_xmm.asm 15 Sep 2009 12:43:18 -0000
@@ -436,8 +436,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/plugins/x86_asm/plugin_ssim-a.asm
===================================================================
RCS file: /xvid/xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm,v
retrieving revision 1.12
diff -u -r1.12 plugin_ssim-a.asm
--- src/plugins/x86_asm/plugin_ssim-a.asm 4 Dec 2008 14:41:50 -0000 1.12
+++ src/plugins/x86_asm/plugin_ssim-a.asm 15 Sep 2009 12:43:18 -0000
@@ -265,6 +265,4 @@
ret
ENDFUNC
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
+NON_EXEC_STACK
Index: src/quant/x86_asm/quantize_h263_3dne.asm
===================================================================
RCS file: /xvid/xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm,v
retrieving revision 1.11
diff -u -r1.11 quantize_h263_3dne.asm
--- src/quant/x86_asm/quantize_h263_3dne.asm 4 Dec 2008 18:30:36 -0000 1.11
+++ src/quant/x86_asm/quantize_h263_3dne.asm 15 Sep 2009 12:43:18 -0000
@@ -930,7 +930,4 @@
ret
ENDFUNC
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/quant/x86_asm/quantize_h263_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm,v
retrieving revision 1.15
diff -u -r1.15 quantize_h263_mmx.asm
--- src/quant/x86_asm/quantize_h263_mmx.asm 4 Dec 2008 18:30:36 -0000 1.15
+++ src/quant/x86_asm/quantize_h263_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -1068,8 +1068,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/quant/x86_asm/quantize_mpeg_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm,v
retrieving revision 1.15
diff -u -r1.15 quantize_mpeg_mmx.asm
--- src/quant/x86_asm/quantize_mpeg_mmx.asm 4 Dec 2008 18:30:36 -0000 1.15
+++ src/quant/x86_asm/quantize_mpeg_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -658,8 +658,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/quant/x86_asm/quantize_mpeg_xmm.asm
===================================================================
RCS file: /xvid/xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm,v
retrieving revision 1.12
diff -u -r1.12 quantize_mpeg_xmm.asm
--- src/quant/x86_asm/quantize_mpeg_xmm.asm 4 Dec 2008 18:30:36 -0000 1.12
+++ src/quant/x86_asm/quantize_mpeg_xmm.asm 15 Sep 2009 12:43:18 -0000
@@ -618,8 +618,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/utils/x86_asm/cpuid.asm
===================================================================
RCS file: /xvid/xvidcore/src/utils/x86_asm/cpuid.asm,v
retrieving revision 1.18
diff -u -r1.18 cpuid.asm
--- src/utils/x86_asm/cpuid.asm 4 Dec 2008 14:41:50 -0000 1.18
+++ src/utils/x86_asm/cpuid.asm 15 Sep 2009 12:43:18 -0000
@@ -239,7 +239,4 @@
%endif
%endif
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/utils/x86_asm/interlacing_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/utils/x86_asm/interlacing_mmx.asm,v
retrieving revision 1.11
diff -u -r1.11 interlacing_mmx.asm
--- src/utils/x86_asm/interlacing_mmx.asm 4 Dec 2008 14:41:50 -0000 1.11
+++ src/utils/x86_asm/interlacing_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -198,8 +198,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/utils/x86_asm/mem_transfer_3dne.asm
===================================================================
RCS file: /xvid/xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm,v
retrieving revision 1.12
diff -u -r1.12 mem_transfer_3dne.asm
--- src/utils/x86_asm/mem_transfer_3dne.asm 4 Dec 2008 14:41:50 -0000 1.12
+++ src/utils/x86_asm/mem_transfer_3dne.asm 15 Sep 2009 12:43:18 -0000
@@ -465,8 +465,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
Index: src/utils/x86_asm/mem_transfer_mmx.asm
===================================================================
RCS file: /xvid/xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm,v
retrieving revision 1.21
diff -u -r1.21 mem_transfer_mmx.asm
--- src/utils/x86_asm/mem_transfer_mmx.asm 4 Dec 2008 14:41:50 -0000 1.21
+++ src/utils/x86_asm/mem_transfer_mmx.asm 15 Sep 2009 12:43:18 -0000
@@ -588,8 +588,4 @@
ret
ENDFUNC
-
-%ifidn __OUTPUT_FORMAT__,elf
-section ".note.GNU-stack" noalloc noexec nowrite progbits
-%endif
-
+NON_EXEC_STACK
More information about the Xvid-devel
mailing list