1 |
ssuominen 10/02/21 10:15:38 |
2 |
|
3 |
Added: xvid-1.2.2-noexecstack.patch |
4 |
Log: |
5 |
Apply rpmfusion noexecstack patch from bug 258804, thanks to Pacho Ramos. |
6 |
(Portage version: 2.2_rc63/cvs/Linux x86_64) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-libs/xvid/files/xvid-1.2.2-noexecstack.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/xvid/files/xvid-1.2.2-noexecstack.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/xvid/files/xvid-1.2.2-noexecstack.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: xvid-1.2.2-noexecstack.patch |
15 |
=================================================================== |
16 |
diff -up xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_mmx.asm |
17 |
--- xvidcore/src/bitstream/x86_asm/cbp_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
18 |
+++ xvidcore/src/bitstream/x86_asm/cbp_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
19 |
@@ -126,8 +126,4 @@ calc_cbp_mmx: |
20 |
ret |
21 |
ENDFUNC |
22 |
|
23 |
- |
24 |
-%ifidn __OUTPUT_FORMAT__,elf |
25 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
26 |
-%endif |
27 |
- |
28 |
+NON_EXEC_STACK |
29 |
diff -up xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack xvidcore/src/bitstream/x86_asm/cbp_sse2.asm |
30 |
--- xvidcore/src/bitstream/x86_asm/cbp_sse2.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
31 |
+++ xvidcore/src/bitstream/x86_asm/cbp_sse2.asm 2009-09-21 10:39:24.000000000 +0200 |
32 |
@@ -116,8 +116,4 @@ calc_cbp_sse2: |
33 |
ret |
34 |
ENDFUNC |
35 |
|
36 |
- |
37 |
-%ifidn __OUTPUT_FORMAT__,elf |
38 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
39 |
-%endif |
40 |
- |
41 |
+NON_EXEC_STACK |
42 |
diff -up xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm |
43 |
--- xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
44 |
+++ xvidcore/src/dct/x86_asm/fdct_mmx_ffmpeg.asm 2009-09-21 10:39:24.000000000 +0200 |
45 |
@@ -401,7 +401,4 @@ MAKE_FDCT_FUNC fdct_mmx_ffmpeg, FDCT_ROW |
46 |
|
47 |
MAKE_FDCT_FUNC fdct_xmm_ffmpeg, FDCT_ROW_XMM |
48 |
|
49 |
-%ifidn __OUTPUT_FORMAT__,elf |
50 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
51 |
-%endif |
52 |
- |
53 |
+NON_EXEC_STACK |
54 |
diff -up xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm |
55 |
--- xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
56 |
+++ xvidcore/src/dct/x86_asm/fdct_mmx_skal.asm 2009-09-21 10:39:24.000000000 +0200 |
57 |
@@ -500,7 +500,4 @@ MAKE_FDCT_FUNC fdct_mmx_skal, fMTX_MULT_ |
58 |
|
59 |
MAKE_FDCT_FUNC fdct_xmm_skal, fMTX_MULT_XMM |
60 |
|
61 |
-%ifidn __OUTPUT_FORMAT__,elf |
62 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
63 |
-%endif |
64 |
- |
65 |
+NON_EXEC_STACK |
66 |
diff -up xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm |
67 |
--- xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
68 |
+++ xvidcore/src/dct/x86_asm/fdct_sse2_skal.asm 2009-09-21 10:39:24.000000000 +0200 |
69 |
@@ -605,7 +605,4 @@ fdct_sse2_skal: |
70 |
ENDFUNC |
71 |
|
72 |
|
73 |
-%ifidn __OUTPUT_FORMAT__,elf |
74 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
75 |
-%endif |
76 |
- |
77 |
+NON_EXEC_STACK |
78 |
diff -up xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_3dne.asm |
79 |
--- xvidcore/src/dct/x86_asm/idct_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
80 |
+++ xvidcore/src/dct/x86_asm/idct_3dne.asm 2009-09-21 10:39:24.000000000 +0200 |
81 |
@@ -698,8 +698,4 @@ idct_3dne: |
82 |
ret |
83 |
ENDFUNC |
84 |
|
85 |
- |
86 |
-%ifidn __OUTPUT_FORMAT__,elf |
87 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
88 |
-%endif |
89 |
- |
90 |
+NON_EXEC_STACK |
91 |
diff -up xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_mmx.asm |
92 |
--- xvidcore/src/dct/x86_asm/idct_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
93 |
+++ xvidcore/src/dct/x86_asm/idct_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
94 |
@@ -608,8 +608,4 @@ idct_xmm: |
95 |
ret |
96 |
ENDFUNC |
97 |
|
98 |
- |
99 |
-%ifidn __OUTPUT_FORMAT__,elf |
100 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
101 |
-%endif |
102 |
- |
103 |
+NON_EXEC_STACK |
104 |
diff -up xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm |
105 |
--- xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
106 |
+++ xvidcore/src/dct/x86_asm/idct_sse2_dmitry.asm 2009-09-21 10:39:24.000000000 +0200 |
107 |
@@ -325,8 +325,4 @@ idct_sse2_dmitry: |
108 |
ret |
109 |
ENDFUNC |
110 |
|
111 |
- |
112 |
-%ifidn __OUTPUT_FORMAT__,elf |
113 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
114 |
-%endif |
115 |
- |
116 |
+NON_EXEC_STACK |
117 |
diff -up xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm |
118 |
--- xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
119 |
+++ xvidcore/src/image/x86_asm/colorspace_rgb_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
120 |
@@ -514,8 +514,4 @@ MAKE_COLORSPACE rgba_to_yv12_mmx,0, 4 |
121 |
MAKE_COLORSPACE yv12_to_bgr_mmx,48, 3,8,2, YV12_TO_BGR, 3, -1 |
122 |
MAKE_COLORSPACE yv12_to_bgra_mmx,48, 4,8,2, YV12_TO_BGR, 4, -1 |
123 |
|
124 |
- |
125 |
-%ifidn __OUTPUT_FORMAT__,elf |
126 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
127 |
-%endif |
128 |
- |
129 |
+NON_EXEC_STACK |
130 |
diff -up xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm |
131 |
--- xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
132 |
+++ xvidcore/src/image/x86_asm/colorspace_yuv_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
133 |
@@ -474,7 +474,4 @@ MAKE_YV12_TO_YV12 yv12_to_yv12_mmx, 0 |
134 |
|
135 |
MAKE_YV12_TO_YV12 yv12_to_yv12_xmm, 1 |
136 |
|
137 |
-%ifidn __OUTPUT_FORMAT__,elf |
138 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
139 |
-%endif |
140 |
- |
141 |
+NON_EXEC_STACK |
142 |
diff -up xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm |
143 |
--- xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
144 |
+++ xvidcore/src/image/x86_asm/colorspace_yuyv_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
145 |
@@ -341,7 +341,4 @@ MAKE_COLORSPACE yv12_to_uyvy_mmx,0, |
146 |
MAKE_COLORSPACE yv12_to_yuyvi_mmx,0, 2,8,4, YV12_TO_YUYVI, 0, -1 |
147 |
MAKE_COLORSPACE yv12_to_uyvyi_mmx,0, 2,8,4, YV12_TO_YUYVI, 1, -1 |
148 |
|
149 |
-%ifidn __OUTPUT_FORMAT__,elf |
150 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
151 |
-%endif |
152 |
- |
153 |
+NON_EXEC_STACK |
154 |
diff -up xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack xvidcore/src/image/x86_asm/deintl_sse.asm |
155 |
--- xvidcore/src/image/x86_asm/deintl_sse.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
156 |
+++ xvidcore/src/image/x86_asm/deintl_sse.asm 2009-09-21 10:39:24.000000000 +0200 |
157 |
@@ -131,7 +131,4 @@ xvid_deinterlace_sse: |
158 |
ENDFUNC |
159 |
|
160 |
;////////////////////////////////////////////////////////////////////// |
161 |
- |
162 |
-%ifidn __OUTPUT_FORMAT__,elf |
163 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
164 |
-%endif |
165 |
+NON_EXEC_STACK |
166 |
diff -up xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/gmc_mmx.asm |
167 |
--- xvidcore/src/image/x86_asm/gmc_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
168 |
+++ xvidcore/src/image/x86_asm/gmc_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
169 |
@@ -220,7 +220,4 @@ xvid_GMC_Core_Lin_8_sse41: |
170 |
ENDFUNC |
171 |
|
172 |
;////////////////////////////////////////////////////////////////////// |
173 |
- |
174 |
-%ifidn __OUTPUT_FORMAT__,elf |
175 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
176 |
-%endif |
177 |
+NON_EXEC_STACK |
178 |
diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm |
179 |
--- xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
180 |
+++ xvidcore/src/image/x86_asm/interpolate8x8_3dn.asm 2009-09-21 10:39:24.000000000 +0200 |
181 |
@@ -463,8 +463,4 @@ interpolate8x4_halfpel_hv_3dn: |
182 |
ret |
183 |
ENDFUNC |
184 |
|
185 |
- |
186 |
-%ifidn __OUTPUT_FORMAT__,elf |
187 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
188 |
-%endif |
189 |
- |
190 |
+NON_EXEC_STACK |
191 |
diff -up xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm |
192 |
--- xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
193 |
+++ xvidcore/src/image/x86_asm/interpolate8x8_3dne.asm 2009-09-21 10:39:24.000000000 +0200 |
194 |
@@ -563,8 +563,4 @@ ALIGN SECTION_ALIGN |
195 |
ret |
196 |
ENDFUNC |
197 |
|
198 |
- |
199 |
-%ifidn __OUTPUT_FORMAT__,elf |
200 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
201 |
-%endif |
202 |
- |
203 |
+NON_EXEC_STACK |
204 |
diff -up xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm |
205 |
--- xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
206 |
+++ xvidcore/src/image/x86_asm/interpolate8x8_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
207 |
@@ -1328,8 +1328,4 @@ interpolate8x8_halfpel_hv_add_mmx: |
208 |
ret |
209 |
ENDFUNC |
210 |
|
211 |
- |
212 |
-%ifidn __OUTPUT_FORMAT__,elf |
213 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
214 |
-%endif |
215 |
- |
216 |
+NON_EXEC_STACK |
217 |
diff -up xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm |
218 |
--- xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
219 |
+++ xvidcore/src/image/x86_asm/interpolate8x8_xmm.asm 2009-09-21 10:39:24.000000000 +0200 |
220 |
@@ -819,8 +819,4 @@ interpolate8x8_halfpel_hv_add_xmm: |
221 |
EPILOG |
222 |
ENDFUNC |
223 |
|
224 |
- |
225 |
-%ifidn __OUTPUT_FORMAT__,elf |
226 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
227 |
-%endif |
228 |
- |
229 |
+NON_EXEC_STACK |
230 |
diff -up xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_mmx.asm |
231 |
--- xvidcore/src/image/x86_asm/postprocessing_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
232 |
+++ xvidcore/src/image/x86_asm/postprocessing_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
233 |
@@ -114,7 +114,4 @@ image_brightness_mmx: |
234 |
ENDFUNC |
235 |
;////////////////////////////////////////////////////////////////////// |
236 |
|
237 |
-%ifidn __OUTPUT_FORMAT__,elf |
238 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
239 |
-%endif |
240 |
- |
241 |
+NON_EXEC_STACK |
242 |
diff -up xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack xvidcore/src/image/x86_asm/postprocessing_sse2.asm |
243 |
--- xvidcore/src/image/x86_asm/postprocessing_sse2.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
244 |
+++ xvidcore/src/image/x86_asm/postprocessing_sse2.asm 2009-09-21 10:39:24.000000000 +0200 |
245 |
@@ -130,7 +130,4 @@ image_brightness_sse2: |
246 |
ENDFUNC |
247 |
;////////////////////////////////////////////////////////////////////// |
248 |
|
249 |
-%ifidn __OUTPUT_FORMAT__,elf |
250 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
251 |
-%endif |
252 |
- |
253 |
+NON_EXEC_STACK |
254 |
diff -up xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/qpel_mmx.asm |
255 |
--- xvidcore/src/image/x86_asm/qpel_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
256 |
+++ xvidcore/src/image/x86_asm/qpel_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
257 |
@@ -1149,7 +1149,4 @@ ENDFUNC |
258 |
%undef SRC_PTR |
259 |
%undef DST_PTR |
260 |
|
261 |
-%ifidn __OUTPUT_FORMAT__,elf |
262 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
263 |
-%endif |
264 |
- |
265 |
+NON_EXEC_STACK |
266 |
diff -up xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack xvidcore/src/image/x86_asm/reduced_mmx.asm |
267 |
--- xvidcore/src/image/x86_asm/reduced_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
268 |
+++ xvidcore/src/image/x86_asm/reduced_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
269 |
@@ -985,8 +985,4 @@ ENDFUNC |
270 |
|
271 |
; pfeewwww... Never Do That On Stage Again. :) |
272 |
|
273 |
- |
274 |
-%ifidn __OUTPUT_FORMAT__,elf |
275 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
276 |
-%endif |
277 |
- |
278 |
+NON_EXEC_STACK |
279 |
diff -up xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dn.asm |
280 |
--- xvidcore/src/motion/x86_asm/sad_3dn.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
281 |
+++ xvidcore/src/motion/x86_asm/sad_3dn.asm 2009-09-21 10:39:24.000000000 +0200 |
282 |
@@ -216,8 +216,4 @@ sad8bi_3dn: |
283 |
ret |
284 |
ENDFUNC |
285 |
|
286 |
- |
287 |
-%ifidn __OUTPUT_FORMAT__,elf |
288 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
289 |
-%endif |
290 |
- |
291 |
+NON_EXEC_STACK |
292 |
diff -up xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_3dne.asm |
293 |
--- xvidcore/src/motion/x86_asm/sad_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
294 |
+++ xvidcore/src/motion/x86_asm/sad_3dne.asm 2009-09-21 10:39:24.000000000 +0200 |
295 |
@@ -490,8 +490,4 @@ ALIGN SECTION_ALIGN |
296 |
ret |
297 |
ENDFUNC |
298 |
|
299 |
- |
300 |
-%ifidn __OUTPUT_FORMAT__,elf |
301 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
302 |
-%endif |
303 |
- |
304 |
+NON_EXEC_STACK |
305 |
diff -up xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_mmx.asm |
306 |
--- xvidcore/src/motion/x86_asm/sad_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
307 |
+++ xvidcore/src/motion/x86_asm/sad_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
308 |
@@ -731,8 +731,4 @@ sse8_8bit_mmx: |
309 |
ret |
310 |
ENDFUNC |
311 |
|
312 |
- |
313 |
-%ifidn __OUTPUT_FORMAT__,elf |
314 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
315 |
-%endif |
316 |
- |
317 |
+NON_EXEC_STACK |
318 |
diff -up xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_sse2.asm |
319 |
--- xvidcore/src/motion/x86_asm/sad_sse2.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
320 |
+++ xvidcore/src/motion/x86_asm/sad_sse2.asm 2009-09-21 10:39:24.000000000 +0200 |
321 |
@@ -176,8 +176,4 @@ dev16_sse3: |
322 |
MEAN16_SSE2_SSE3 lddqu |
323 |
ENDFUNC |
324 |
|
325 |
- |
326 |
-%ifidn __OUTPUT_FORMAT__,elf |
327 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
328 |
-%endif |
329 |
- |
330 |
+NON_EXEC_STACK |
331 |
diff -up xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack xvidcore/src/motion/x86_asm/sad_xmm.asm |
332 |
--- xvidcore/src/motion/x86_asm/sad_xmm.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
333 |
+++ xvidcore/src/motion/x86_asm/sad_xmm.asm 2009-09-21 10:39:24.000000000 +0200 |
334 |
@@ -436,8 +436,4 @@ sad16v_xmm: |
335 |
ret |
336 |
ENDFUNC |
337 |
|
338 |
- |
339 |
-%ifidn __OUTPUT_FORMAT__,elf |
340 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
341 |
-%endif |
342 |
- |
343 |
+NON_EXEC_STACK |
344 |
diff -up xvidcore/src/nasm.inc.noexec-stack xvidcore/src/nasm.inc |
345 |
--- xvidcore/src/nasm.inc.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
346 |
+++ xvidcore/src/nasm.inc 2009-09-21 10:39:24.000000000 +0200 |
347 |
@@ -189,3 +189,12 @@ BITS 32 |
348 |
%endif |
349 |
%endif |
350 |
%endmacro |
351 |
+ |
352 |
+%macro NON_EXEC_STACK 0 |
353 |
+%ifidn __OUTPUT_FORMAT__,elf |
354 |
+section .note.GNU-stack noalloc noexec nowrite progbits |
355 |
+%endif |
356 |
+%ifidn __OUTPUT_FORMAT__,elf64 |
357 |
+section .note.GNU-stack noalloc noexec nowrite progbits |
358 |
+%endif |
359 |
+%endmacro |
360 |
diff -up xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm |
361 |
--- xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
362 |
+++ xvidcore/src/plugins/x86_asm/plugin_ssim-a.asm 2009-09-21 10:39:24.000000000 +0200 |
363 |
@@ -273,6 +273,4 @@ consim_mmx: |
364 |
ret |
365 |
ENDFUNC |
366 |
|
367 |
-%ifidn __OUTPUT_FORMAT__,elf |
368 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
369 |
-%endif |
370 |
+NON_EXEC_STACK |
371 |
diff -up xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm |
372 |
--- xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
373 |
+++ xvidcore/src/quant/x86_asm/quantize_h263_3dne.asm 2009-09-21 10:39:24.000000000 +0200 |
374 |
@@ -931,7 +931,4 @@ ALIGN SECTION_ALIGN |
375 |
ret |
376 |
ENDFUNC |
377 |
|
378 |
-%ifidn __OUTPUT_FORMAT__,elf |
379 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
380 |
-%endif |
381 |
- |
382 |
+NON_EXEC_STACK |
383 |
diff -up xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm |
384 |
--- xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
385 |
+++ xvidcore/src/quant/x86_asm/quantize_h263_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
386 |
@@ -1070,8 +1070,4 @@ dequant_h263_inter_sse2: |
387 |
ret |
388 |
ENDFUNC |
389 |
|
390 |
- |
391 |
-%ifidn __OUTPUT_FORMAT__,elf |
392 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
393 |
-%endif |
394 |
- |
395 |
+NON_EXEC_STACK |
396 |
diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm |
397 |
--- xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
398 |
+++ xvidcore/src/quant/x86_asm/quantize_mpeg_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
399 |
@@ -657,8 +657,4 @@ ALIGN SECTION_ALIGN |
400 |
ret |
401 |
ENDFUNC |
402 |
|
403 |
- |
404 |
-%ifidn __OUTPUT_FORMAT__,elf |
405 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
406 |
-%endif |
407 |
- |
408 |
+NON_EXEC_STACK |
409 |
diff -up xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm |
410 |
--- xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
411 |
+++ xvidcore/src/quant/x86_asm/quantize_mpeg_xmm.asm 2009-09-21 10:39:24.000000000 +0200 |
412 |
@@ -618,8 +618,4 @@ ALIGN SECTION_ALIGN |
413 |
ret |
414 |
ENDFUNC |
415 |
|
416 |
- |
417 |
-%ifidn __OUTPUT_FORMAT__,elf |
418 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
419 |
-%endif |
420 |
- |
421 |
+NON_EXEC_STACK |
422 |
diff -up xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack xvidcore/src/utils/x86_asm/cpuid.asm |
423 |
--- xvidcore/src/utils/x86_asm/cpuid.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
424 |
+++ xvidcore/src/utils/x86_asm/cpuid.asm 2009-09-21 10:39:24.000000000 +0200 |
425 |
@@ -240,7 +240,4 @@ ENDFUNC |
426 |
%endif |
427 |
|
428 |
|
429 |
-%ifidn __OUTPUT_FORMAT__,elf |
430 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
431 |
-%endif |
432 |
- |
433 |
+NON_EXEC_STACK |
434 |
diff -up xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/interlacing_mmx.asm |
435 |
--- xvidcore/src/utils/x86_asm/interlacing_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
436 |
+++ xvidcore/src/utils/x86_asm/interlacing_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
437 |
@@ -198,8 +198,4 @@ MBFieldTest_mmx: |
438 |
ret |
439 |
ENDFUNC |
440 |
|
441 |
- |
442 |
-%ifidn __OUTPUT_FORMAT__,elf |
443 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
444 |
-%endif |
445 |
- |
446 |
+NON_EXEC_STACK |
447 |
diff -up xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm |
448 |
--- xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
449 |
+++ xvidcore/src/utils/x86_asm/mem_transfer_3dne.asm 2009-09-21 10:39:24.000000000 +0200 |
450 |
@@ -465,8 +465,4 @@ transfer8x4_copy_3dne: |
451 |
ret |
452 |
ENDFUNC |
453 |
|
454 |
- |
455 |
-%ifidn __OUTPUT_FORMAT__,elf |
456 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
457 |
-%endif |
458 |
- |
459 |
+NON_EXEC_STACK |
460 |
diff -up xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm |
461 |
--- xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm.noexec-stack 2009-09-21 10:39:07.000000000 +0200 |
462 |
+++ xvidcore/src/utils/x86_asm/mem_transfer_mmx.asm 2009-09-21 10:39:24.000000000 +0200 |
463 |
@@ -588,8 +588,4 @@ transfer8x4_copy_mmx: |
464 |
ret |
465 |
ENDFUNC |
466 |
|
467 |
- |
468 |
-%ifidn __OUTPUT_FORMAT__,elf |
469 |
-section ".note.GNU-stack" noalloc noexec nowrite progbits |
470 |
-%endif |
471 |
- |
472 |
+NON_EXEC_STACK |