]> git.pld-linux.org Git - packages/XFree86.git/blame - XFree86-exec-shield-GNU-stack.patch
projects / packages / XFree86.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- outdated
[packages/XFree86.git] / XFree86-exec-shield-GNU-stack.patch
CommitLineData
b88abb6c
AM		 1diff -urN xc.org/extras/Mesa/src/X86/3dnow_normal.S xc/extras/Mesa/src/X86/3dnow_normal.S
2--- xc.org/extras/Mesa/src/X86/3dnow_normal.S 2004-06-07 22:15:49.043413960 +0200
3+++ xc/extras/Mesa/src/X86/3dnow_normal.S 2004-06-07 22:18:46.409450224 +0200
4@@ -834,3 +834,6 @@
5 POP_L ( ESI )
6 POP_L ( EDI )
7 RET
8+
9+.section .note.GNU-stack, "", @progbits
10+.previous
11diff -urN xc.org/extras/Mesa/src/X86/3dnow_xform1.S xc/extras/Mesa/src/X86/3dnow_xform1.S
12--- xc.org/extras/Mesa/src/X86/3dnow_xform1.S 2004-06-07 22:15:49.049413048 +0200
13+++ xc/extras/Mesa/src/X86/3dnow_xform1.S 2004-06-07 22:18:46.423448096 +0200
14@@ -420,3 +420,7 @@
15 POP_L ( EDI )
16 POP_L ( ESI )
17 RET
18+
19+.section .note.GNU-stack, "", @progbits
20+.previous
21+
22diff -urN xc.org/extras/Mesa/src/X86/3dnow_xform2.S xc/extras/Mesa/src/X86/3dnow_xform2.S
23--- xc.org/extras/Mesa/src/X86/3dnow_xform2.S 2004-06-07 22:15:49.054412288 +0200
24+++ xc/extras/Mesa/src/X86/3dnow_xform2.S 2004-06-07 22:18:46.440445512 +0200
25@@ -461,3 +461,6 @@
26 POP_L ( EDI )
27 POP_L ( ESI )
28 RET
29+
30+.section .note.GNU-stack, "", @progbits
31+.previous
32diff -urN xc.org/extras/Mesa/src/X86/3dnow_xform3.S xc/extras/Mesa/src/X86/3dnow_xform3.S
33--- xc.org/extras/Mesa/src/X86/3dnow_xform3.S 2004-06-07 22:15:49.080408336 +0200
34+++ xc/extras/Mesa/src/X86/3dnow_xform3.S 2004-06-07 22:18:46.450443992 +0200
35@@ -545,3 +545,6 @@
36 POP_L ( EDI )
37 POP_L ( ESI )
38 RET
39+
40+.section .note.GNU-stack, "", @progbits
41+.previous
42diff -urN xc.org/extras/Mesa/src/X86/3dnow_xform4.S xc/extras/Mesa/src/X86/3dnow_xform4.S
43--- xc.org/extras/Mesa/src/X86/3dnow_xform4.S 2004-06-07 22:15:49.099405448 +0200
44+++ xc/extras/Mesa/src/X86/3dnow_xform4.S 2004-06-07 22:18:46.467441408 +0200
45@@ -554,3 +554,6 @@
46 POP_L ( EDI )
47 POP_L ( ESI )
48 RET
49+
50+.section .note.GNU-stack, "", @progbits
51+.previous
52diff -urN xc.org/extras/Mesa/src/X86/common_x86_asm.S xc/extras/Mesa/src/X86/common_x86_asm.S
53--- xc.org/extras/Mesa/src/X86/common_x86_asm.S 2004-06-07 22:15:49.149397848 +0200
54+++ xc/extras/Mesa/src/X86/common_x86_asm.S 2004-06-07 22:18:46.480439432 +0200
55@@ -235,3 +235,6 @@
56 RET
57
58 #endif
59+
60+.section .note.GNU-stack, "", @progbits
61+.previous
62diff -urN xc.org/extras/Mesa/src/X86/glapi_x86.S xc/extras/Mesa/src/X86/glapi_x86.S
63--- xc.org/extras/Mesa/src/X86/glapi_x86.S 2004-06-07 22:15:49.180393136 +0200
64+++ xc/extras/Mesa/src/X86/glapi_x86.S 2004-06-07 22:18:46.512434568 +0200
65@@ -4859,3 +4859,6 @@
66
67
68 #endif /* __WIN32__ */
69+
70+.section .note.GNU-stack, "", @progbits
71+.previous
72diff -urN xc.org/extras/Mesa/src/X86/mmx_blend.S xc/extras/Mesa/src/X86/mmx_blend.S
73--- xc.org/extras/Mesa/src/X86/mmx_blend.S 2004-06-07 22:15:49.182392832 +0200
74+++ xc/extras/Mesa/src/X86/mmx_blend.S 2004-06-07 22:26:26.487507728 +0200
75@@ -363,3 +363,6 @@
76
77 #include "mmx_blendtmp.h"
78
79+.section .note.GNU-stack, "", @progbits
80+.previous
81+
82diff -urN xc.org/extras/Mesa/src/X86/sse_normal.S xc/extras/Mesa/src/X86/sse_normal.S
83--- xc.org/extras/Mesa/src/X86/sse_normal.S 2004-06-07 22:15:49.260380976 +0200
84+++ xc/extras/Mesa/src/X86/sse_normal.S 2004-06-07 22:18:46.527432288 +0200
85@@ -249,3 +249,6 @@
86 POP_L ( ESI )
87 RET
88 #undef FRAME_OFFSET
89+
90+.section .note.GNU-stack, "", @progbits
91+.previous
92diff -urN xc.org/extras/Mesa/src/X86/sse_xform1.S xc/extras/Mesa/src/X86/sse_xform1.S
93--- xc.org/extras/Mesa/src/X86/sse_xform1.S 2004-06-07 22:15:49.267379912 +0200
94+++ xc/extras/Mesa/src/X86/sse_xform1.S 2004-06-07 22:18:46.578424536 +0200
95@@ -430,3 +430,6 @@
96 POP_L( ESI )
97 RET
98 #undef FRAME_OFFSET
99+
100+.section .note.GNU-stack, "", @progbits
101+.previous
102diff -urN xc.org/extras/Mesa/src/X86/sse_xform2.S xc/extras/Mesa/src/X86/sse_xform2.S
103--- xc.org/extras/Mesa/src/X86/sse_xform2.S 2004-06-07 22:15:49.269379608 +0200
104+++ xc/extras/Mesa/src/X86/sse_xform2.S 2004-06-07 22:18:46.604420584 +0200
105@@ -449,3 +449,6 @@
106 POP_L( ESI )
107 RET
108 #undef FRAME_OFFSET
109+
110+.section .note.GNU-stack, "", @progbits
111+.previous
112diff -urN xc.org/extras/Mesa/src/X86/sse_xform3.S xc/extras/Mesa/src/X86/sse_xform3.S
113--- xc.org/extras/Mesa/src/X86/sse_xform3.S 2004-06-07 22:15:49.284377328 +0200
114+++ xc/extras/Mesa/src/X86/sse_xform3.S 2004-06-07 22:18:46.612419368 +0200
115@@ -495,3 +495,6 @@
116 POP_L( ESI )
117 RET
118 #undef FRAME_OFFSET
119+
120+.section .note.GNU-stack, "", @progbits
121+.previous
122diff -urN xc.org/extras/Mesa/src/X86/sse_xform4.S xc/extras/Mesa/src/X86/sse_xform4.S
123--- xc.org/extras/Mesa/src/X86/sse_xform4.S 2004-06-07 22:15:49.285377176 +0200
124+++ xc/extras/Mesa/src/X86/sse_xform4.S 2004-06-07 22:18:46.617418608 +0200
125@@ -223,3 +223,6 @@
126 POP_L( EDI )
127 POP_L( ESI )
128 RET
129+
130+.section .note.GNU-stack, "", @progbits
131+.previous
132diff -urN xc.org/extras/Mesa/src/X86/x86_cliptest.S xc/extras/Mesa/src/X86/x86_cliptest.S
133--- xc.org/extras/Mesa/src/X86/x86_cliptest.S 2004-06-07 22:15:49.303374440 +0200
134+++ xc/extras/Mesa/src/X86/x86_cliptest.S 2004-06-07 22:18:46.621418000 +0200
135@@ -398,3 +398,6 @@
136 POP_L( ESI )
137
138 RET
139+
140+.section .note.GNU-stack, "", @progbits
141+.previous
142diff -urN xc.org/extras/Mesa/src/X86/x86_xform2.S xc/extras/Mesa/src/X86/x86_xform2.S
143--- xc.org/extras/Mesa/src/X86/x86_xform2.S 2004-06-07 22:15:49.304374288 +0200
144+++ xc/extras/Mesa/src/X86/x86_xform2.S 2004-06-07 22:18:46.626417240 +0200
145@@ -560,3 +560,6 @@
146 POP_L( ESI )
147 RET
148 #undef FRAME_OFFSET
149+
150+.section .note.GNU-stack, "", @progbits
151+.previous
152diff -urN xc.org/extras/Mesa/src/X86/x86_xform3.S xc/extras/Mesa/src/X86/x86_xform3.S
153--- xc.org/extras/Mesa/src/X86/x86_xform3.S 2004-06-07 22:15:49.328370640 +0200
154+++ xc/extras/Mesa/src/X86/x86_xform3.S 2004-06-07 22:18:46.641414960 +0200
155@@ -630,3 +630,6 @@
156 POP_L( EDI )
157 POP_L( ESI )
158 RET
159+
160+.section .note.GNU-stack, "", @progbits
161+.previous
162diff -urN xc.org/extras/Mesa/src/X86/x86_xform4.S xc/extras/Mesa/src/X86/x86_xform4.S
163--- xc.org/extras/Mesa/src/X86/x86_xform4.S 2004-06-07 22:15:49.358366080 +0200
164+++ xc/extras/Mesa/src/X86/x86_xform4.S 2004-06-07 22:18:46.645414352 +0200
165@@ -663,3 +663,6 @@
166 POP_L( EDI )
167 POP_L( ESI )
168 RET
169+
170+.section .note.GNU-stack, "", @progbits
171+.previous
172diff -urN xc.org/lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S xc/lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S
173--- xc.org/lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S 2004-06-07 22:15:15.358534840 +0200
174+++ xc/lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S 2004-06-07 22:23:33.798760408 +0200
175@@ -492,3 +492,7 @@
176 ret
177 GLOBL( _sse_MultiTexCoord2f_2_end )
178 #endif
179+
180+.section .note.GNU-stack, "", @progbits
181+.previous
182+
183diff -urN xc.org/lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S xc/lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S
184--- xc.org/lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S 2004-06-07 22:15:16.372380712 +0200
185+++ xc/lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S 2004-06-07 22:23:57.166208016 +0200
186@@ -492,3 +492,7 @@
187 ret
188 GLOBL( _sse_MultiTexCoord2f_2_end )
189 #endif
190+
191+.section .note.GNU-stack, "", @progbits
192+.previous
193+
194diff -urN xc.org/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S
195--- xc.org/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S 2004-06-07 22:15:16.909299088 +0200
196+++ xc/lib/GL/mesa/src/drv/tdfx/X86/fx_3dnow_fastpath.S 2004-06-07 22:24:30.021213296 +0200
197@@ -81,4 +81,6 @@
198 #define TAG(x) x##_RGBA_TMU1
199 #include "fx_3dnow_fasttmp.h"
200
201+.section .note.GNU-stack, "", @progbits
202+.previous
203
204diff -urN xc.org/LOG xc/LOG
205--- xc.org/LOG 1970-01-01 01:00:00.000000000 +0100
206+++ xc/LOG 2004-06-07 22:18:46.677409488 +0200
207@@ -0,0 +1,57 @@
208+patching file extras/Mesa/src/X86/3dnow_normal.S
209+patching file extras/Mesa/src/X86/3dnow_xform1.S
210+patching file extras/Mesa/src/X86/3dnow_xform2.S
211+patching file extras/Mesa/src/X86/3dnow_xform3.S
212+patching file extras/Mesa/src/X86/3dnow_xform4.S
213+patching file extras/Mesa/src/X86/common_x86_asm.S
214+Hunk #1 succeeded at 235 (offset -2 lines).
215+patching file extras/Mesa/src/X86/glapi_x86.S
216+Hunk #1 succeeded at 4859 with fuzz 1 (offset 4085 lines).
217+patching file extras/Mesa/src/X86/mmx_blend.S
218+Hunk #1 FAILED at 416.
219+1 out of 1 hunk FAILED -- saving rejects to file extras/Mesa/src/X86/mmx_blend.S.rej
220+patching file extras/Mesa/src/X86/sse_normal.S
221+can't find file to patch at input line 85
222+Perhaps you used the wrong -p or --strip option?
223+The text leading up to this was:
224+--------------------------
225+|--- xc/extras/Mesa/src/X86/sse_vertex.S.exec-shield-GNU-stack 2003-10-23 17:49:41.000000000 -0400
226+|+++ xc/extras/Mesa/src/X86/sse_vertex.S 2003-10-23 17:51:50.000000000 -0400
227+--------------------------
228+File to patch:
229+Skip this patch? [y]
230+Skipping patch.
231+1 out of 1 hunk ignored
232+patching file extras/Mesa/src/X86/sse_xform1.S
233+patching file extras/Mesa/src/X86/sse_xform2.S
234+patching file extras/Mesa/src/X86/sse_xform3.S
235+patching file extras/Mesa/src/X86/sse_xform4.S
236+patching file extras/Mesa/src/X86/x86_cliptest.S
237+Hunk #1 succeeded at 398 (offset -1 lines).
238+can't find file to patch at input line 139
239+Perhaps you used the wrong -p or --strip option?
240+The text leading up to this was:
241+--------------------------
242+|--- xc/extras/Mesa/src/X86/x86_vertex.S.exec-shield-GNU-stack 2003-10-23 17:49:41.000000000 -0400
243+|+++ xc/extras/Mesa/src/X86/x86_vertex.S 2003-10-23 17:52:30.000000000 -0400
244+--------------------------
245+File to patch:
246+Skip this patch? [y]
247+Skipping patch.
248+1 out of 1 hunk ignored
249+patching file extras/Mesa/src/X86/x86_xform2.S
250+Hunk #1 succeeded at 560 (offset -1 lines).
251+patching file extras/Mesa/src/X86/x86_xform3.S
252+Hunk #1 succeeded at 630 (offset -1 lines).
253+patching file extras/Mesa/src/X86/x86_xform4.S
254+Hunk #1 succeeded at 663 (offset -1 lines).
255+patching file lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S
256+Hunk #1 FAILED at 408.
257+1 out of 1 hunk FAILED -- saving rejects to file lib/GL/mesa/src/drv/r200/r200_vtxtmp_x86.S.rej
258+patching file lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S
259+Hunk #1 FAILED at 408.
260+1 out of 1 hunk FAILED -- saving rejects to file lib/GL/mesa/src/drv/radeon/radeon_vtxtmp_x86.S.rej
261+patching file programs/Xserver/hw/xfree86/drivers/nsc/nsc_msr_asm.S
262+patching file programs/Xserver/hw/xfree86/os-support/misc/IODelay.S
263+patching file programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.S
264+patching file programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S
265diff -urN xc.org/programs/Xserver/hw/xfree86/drivers/nsc/nsc_msr_asm.S xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_msr_asm.S
266--- xc.org/programs/Xserver/hw/xfree86/drivers/nsc/nsc_msr_asm.S 2004-06-07 22:17:39.610605192 +0200
267+++ xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_msr_asm.S 2004-06-07 22:18:46.673410096 +0200
268@@ -225,5 +225,8 @@
269 LEAVE
270 RET
271
272+.section .note.GNU-stack, "", @progbits
273+.previous
274+
275 /*###################################*/
276
277diff -urN xc.org/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S
278--- xc.org/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S 2004-06-07 22:17:59.337606232 +0200
279+++ xc/programs/Xserver/hw/xfree86/os-support/misc/BUSmemcpy.S 2004-06-07 22:18:46.678409336 +0200
280@@ -154,3 +154,5 @@
281 MOV_L (EDX, EDI)
282 RET
283
284+.section .note.GNU-stack, "", @progbits
285+.previous
286diff -urN xc.org/programs/Xserver/hw/xfree86/os-support/misc/IODelay.S xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.S
287--- xc.org/programs/Xserver/hw/xfree86/os-support/misc/IODelay.S 2004-06-07 22:17:59.350604256 +0200
288+++ xc/programs/Xserver/hw/xfree86/os-support/misc/IODelay.S 2004-06-07 22:18:46.675409792 +0200
289@@ -51,3 +51,5 @@
290 JNE (delay_it)
291 RET
292
293+.section .note.GNU-stack, "", @progbits
294+.previous
295diff -urN xc.org/programs/Xserver/hw/xfree86/os-support/misc/PortIO.S xc/programs/Xserver/hw/xfree86/os-support/misc/PortIO.S
296--- xc.org/programs/Xserver/hw/xfree86/os-support/misc/PortIO.S 2004-06-07 22:17:59.366601824 +0200
297+++ xc/programs/Xserver/hw/xfree86/os-support/misc/PortIO.S 2004-06-07 22:28:31.581490552 +0200
298@@ -54,4 +54,6 @@
299 MOV_L (REGOFF(4,ESP), EDX)
300 IN_L
301 RET
302+.section .note.GNU-stack, "", @progbits
303+.previous
304
305diff -urN xc.org/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.S xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.S
306--- xc.org/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.S 2004-06-07 22:17:59.367601672 +0200
307+++ xc/programs/Xserver/hw/xfree86/os-support/misc/SlowBcopy.S 2004-06-07 22:18:46.676409640 +0200
308@@ -106,3 +106,6 @@
309 POP_L (EBP)
310 RET
311
312+.section .note.GNU-stack, "", @progbits
313+.previous
314+
XFree86 Window System servers and basic programs
This page took 0.150498 seconds and 4 git commands to generate.