1 |
vapier 08/05/10 11:08:19 |
2 |
|
3 |
Added: sdl-gfx-2.0.16-gcc43.patch |
4 |
Log: |
5 |
Add fix from Debian for building with gcc-4.3 #219621 by Peter Alfredsen. |
6 |
(Portage version: 2.2_pre5) |
7 |
|
8 |
Revision Changes Path |
9 |
1.1 media-libs/sdl-gfx/files/sdl-gfx-2.0.16-gcc43.patch |
10 |
|
11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/sdl-gfx/files/sdl-gfx-2.0.16-gcc43.patch?rev=1.1&view=markup |
12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/media-libs/sdl-gfx/files/sdl-gfx-2.0.16-gcc43.patch?rev=1.1&content-type=text/plain |
13 |
|
14 |
Index: sdl-gfx-2.0.16-gcc43.patch |
15 |
=================================================================== |
16 |
http://bugs.gentoo.org/219621 |
17 |
|
18 |
fix building with gcc-4.3 |
19 |
|
20 |
--- SDL_gfx-2.0.16/SDL_imageFilter.c |
21 |
+++ SDL_gfx-2.0.16/SDL_imageFilter.c |
22 |
@@ -84 +84 @@ |
23 |
- ".L1010: \n\t" "movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
24 |
+ "1: movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
25 |
@@ -90 +90 @@ |
26 |
- "jnz .L1010 \n\t" /* check loop termination, proceed if required */ |
27 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
28 |
@@ -161 +161 @@ |
29 |
- ".L21011: \n\t" |
30 |
+ "1: \n\t" |
31 |
@@ -177 +177 @@ |
32 |
- "jnz .L21011 \n\t" /* check loop termination, proceed if required */ |
33 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
34 |
@@ -244 +244 @@ |
35 |
- ".L1012: \n\t" "movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
36 |
+ "1: movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
37 |
@@ -250 +250 @@ |
38 |
- "jnz .L1012 \n\t" /* check loop termination, proceed if required */ |
39 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
40 |
@@ -316 +316 @@ |
41 |
- ".L1013: \n\t" "movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
42 |
+ "1: movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
43 |
@@ -325 +325 @@ |
44 |
- "jnz .L1013 \n\t" /* check loop termination, proceed if required */ |
45 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
46 |
@@ -391 +391 @@ |
47 |
- ".L1014: \n\t" "movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
48 |
+ "1: movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
49 |
@@ -415 +415 @@ |
50 |
- "jnz .L1014 \n\t" /* check loop termination, proceed if required */ |
51 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
52 |
@@ -484 +484 @@ |
53 |
- ".L10141: \n\t" "mov (%%edx), %%al \n\t" /* load a byte from Src1 */ |
54 |
+ "1:mov (%%edx), %%al \n\t" /* load a byte from Src1 */ |
55 |
@@ -486 +486 @@ |
56 |
- ".L10142: \n\t" "mov %%al, (%%edi) \n\t" /* move a byte result to Dest */ |
57 |
+ "mov %%al, (%%edi) \n\t" /* move a byte result to Dest */ |
58 |
@@ -490 +490 @@ |
59 |
- "jnz .L10141 \n\t" /* check loop termination, proceed if required */ |
60 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
61 |
@@ -560 +560 @@ |
62 |
- ".L1015: \n\t" "movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
63 |
+ "1: movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
64 |
@@ -577 +577 @@ |
65 |
- "jnz .L1015 \n\t" /* check loop termination, proceed if required */ |
66 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
67 |
@@ -645 +645 @@ |
68 |
- ".L1016: \n\t" "movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
69 |
+ "1: movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
70 |
@@ -664 +664 @@ |
71 |
- "jnz .L1016 \n\t" /* check loop termination, proceed if required */ |
72 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
73 |
@@ -731 +731 @@ |
74 |
- ".L1017: \n\t" "movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
75 |
+ "1: movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
76 |
@@ -737 +737 @@ |
77 |
- "jnz .L1017 \n\t" /* check loop termination, proceed if required */ |
78 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
79 |
@@ -803 +803 @@ |
80 |
- ".L91017: \n\t" "movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
81 |
+ "1: movq (%%eax), %%mm1 \n\t" /* load 8 bytes from Src1 into mm1 */ |
82 |
@@ -809 +809 @@ |
83 |
- "jnz .L91017 \n\t" /* check loop termination, proceed if required */ |
84 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
85 |
@@ -871 +871 @@ |
86 |
- ".L10191: \n\t" "mov (%%esi), %%bl \n\t" /* load a byte from Src2 */ |
87 |
+ "1: mov (%%esi), %%bl \n\t" /* load a byte from Src2 */ |
88 |
@@ -873,2 +873,2 @@ |
89 |
- "jnz .L10192 \n\t" "movb $255, (%%edi) \n\t" /* division by zero = 255 !!! */ |
90 |
- "jmp .L10193 \n\t" ".L10192: \n\t" "xor %%ah, %%ah \n\t" /* prepare AX, zero AH register */ |
91 |
+ "jnz 2f \n\t" "movb $255, (%%edi) \n\t" /* division by zero = 255 !!! */ |
92 |
+ "jmp 3f \n\t" "2: \n\t" "xor %%ah, %%ah \n\t" /* prepare AX, zero AH register */ |
93 |
@@ -878 +878 @@ |
94 |
- ".L10193: \n\t" "inc %%edx \n\t" /* increment Src1, Src2, Dest */ |
95 |
+ "3: inc %%edx \n\t" /* increment Src1, Src2, Dest */ |
96 |
@@ -881 +881 @@ |
97 |
- "jnz .L10191 \n\t" /* check loop termination, proceed if required */ |
98 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
99 |
@@ -942 +942 @@ |
100 |
- ".L91117: \n\t" "movq (%%eax), %%mm0 \n\t" /* load 8 bytes from Src1 into mm1 */ |
101 |
+ "1: movq (%%eax), %%mm0 \n\t" /* load 8 bytes from Src1 into mm1 */ |
102 |
@@ -947 +947 @@ |
103 |
- "jnz .L91117 \n\t" /* check loop termination, proceed if required */ |
104 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
105 |
@@ -1015 +1015 @@ |
106 |
- ".L1021: \n\t" |
107 |
+ "1: \n\t" |
108 |
@@ -1022 +1022 @@ |
109 |
- "jnz .L1021 \n\t" /* check loop termination, proceed if required */ |
110 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
111 |
@@ -1094 +1094 @@ |
112 |
- ".L11023: \n\t" |
113 |
+ "1: \n\t" |
114 |
@@ -1101 +1101 @@ |
115 |
- "jnz .L11023 \n\t" /* check loop termination, proceed if required */ |
116 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
117 |
@@ -1189 +1189 @@ |
118 |
- ".L1022: \n\t" |
119 |
+ "1: \n\t" |
120 |
@@ -1199 +1199 @@ |
121 |
- "jnz .L1022 \n\t" /* check loop termination, proceed if required */ |
122 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
123 |
@@ -1278 +1278 @@ |
124 |
- ".L1023: \n\t" "movq (%%eax), %%mm0 \n\t" /* load 8 bytes from SrcDest into MM0 */ |
125 |
+ "1: movq (%%eax), %%mm0 \n\t" /* load 8 bytes from SrcDest into MM0 */ |
126 |
@@ -1284 +1284 @@ |
127 |
- "jnz .L1023 \n\t" /* check loop termination, proceed if required */ |
128 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
129 |
@@ -1357 +1357 @@ |
130 |
- ".L11024: \n\t" "movq (%%eax), %%mm0 \n\t" /* load 8 bytes from SrcDest into MM0 */ |
131 |
+ "1: movq (%%eax), %%mm0 \n\t" /* load 8 bytes from SrcDest into MM0 */ |
132 |
@@ -1363 +1363 @@ |
133 |
- "jnz .L11024 \n\t" /* check loop termination, proceed if required */ |
134 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
135 |
@@ -1440 +1440 @@ |
136 |
- ".L10240: \n\t" /* ** Prepare proper bit-Mask in MM1 ** */ |
137 |
+ "1: \n\t" /* ** Prepare proper bit-Mask in MM1 ** */ |
138 |
@@ -1445 +1445 @@ |
139 |
- "jnz .L10240 \n\t" /* check loop termination, proceed if required */ |
140 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
141 |
@@ -1452 +1452 @@ |
142 |
- ".L10241: \n\t" |
143 |
+ "2: \n\t" |
144 |
@@ -1461 +1461 @@ |
145 |
- "jnz .L10241 \n\t" /* check loop termination, proceed if required */ |
146 |
+ "jnz 2b \n\t" /* check loop termination, proceed if required */ |
147 |
@@ -1530 +1530 @@ |
148 |
- ".L13023: \n\t" "movq (%%eax), %%mm0 \n\t" /* load 8 bytes from SrcDest into MM0 */ |
149 |
+ "1: movq (%%eax), %%mm0 \n\t" /* load 8 bytes from SrcDest into MM0 */ |
150 |
@@ -1536 +1536 @@ |
151 |
- "jnz .L13023 \n\t" /* check loop termination, proceed if required */ |
152 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
153 |
@@ -1616,2 +1616,2 @@ |
154 |
- "jg .L10251 \n\t" ".align 16 \n\t" /* 16 byte allignment of the loop entry */ |
155 |
- ".L10250: \n\t" "movq (%%eax), %%mm3 \n\t" /* load 8 bytes from Src1 into MM3 */ |
156 |
+ "jg 2f \n\t" ".align 16 \n\t" /* 16 byte allignment of the loop entry */ |
157 |
+ "1: movq (%%eax), %%mm3 \n\t" /* load 8 bytes from Src1 into MM3 */ |
158 |
@@ -1628,3 +1628,3 @@ |
159 |
- "jnz .L10250 \n\t" /* check loop termination, proceed if required */ |
160 |
- "jmp .L10252 \n\t" ".align 16 \n\t" /* 16 byte allignment of the loop entry */ |
161 |
- ".L10251: \n\t" "movq (%%eax), %%mm3 \n\t" /* load 8 bytes from Src1 into MM3 */ |
162 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
163 |
+ "jmp 3f \n\t" ".align 16 \n\t" /* 16 byte allignment of the loop entry */ |
164 |
+ "2: movq (%%eax), %%mm3 \n\t" /* load 8 bytes from Src1 into MM3 */ |
165 |
@@ -1650,2 +1650,2 @@ |
166 |
- "jnz .L10251 \n\t" /* check loop termination, proceed if required */ |
167 |
- ".L10252: \n\t" "emms \n\t" /* exit MMX state */ |
168 |
+ "jnz 2b \n\t" /* check loop termination, proceed if required */ |
169 |
+ "3: emms \n\t" /* exit MMX state */ |
170 |
@@ -1730,2 +1730,2 @@ |
171 |
- ".align 16 \n\t" /* 16 byte allignment of the loop entry */ |
172 |
- ".L1026: \n\t" "movq (%%eax), %%mm3 \n\t" /* load 8 bytes from Src1 into MM3 */ |
173 |
+ ".align 16 \n\t" /* 16 byte allignment of the loop entry */ |
174 |
+ "1: movq (%%eax), %%mm3 \n\t" /* load 8 bytes from Src1 into MM3 */ |
175 |
@@ -1744 +1744 @@ |
176 |
- "jnz .L1026 \n\t" /* check loop termination, proceed if required */ |
177 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
178 |
@@ -1819 +1819 @@ |
179 |
- ".L10270: \n\t" /* ** Prepare proper bit-Mask in MM1 ** */ |
180 |
+ "1: \n\t" /* ** Prepare proper bit-Mask in MM1 ** */ |
181 |
@@ -1823 +1823 @@ |
182 |
- "jnz .L10270 \n\t" /* check loop termination, proceed if required */ |
183 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
184 |
@@ -1830 +1830 @@ |
185 |
- ".L10271: \n\t" "movq (%%eax), %%mm0 \n\t" /* load 8 bytes from Src1 into MM0 */ |
186 |
+ "2: movq (%%eax), %%mm0 \n\t" /* load 8 bytes from Src1 into MM0 */ |
187 |
@@ -1837 +1837 @@ |
188 |
- "jnz .L10271 \n\t" /* check loop termination, proceed if required */ |
189 |
+ "jnz 2b \n\t" /* check loop termination, proceed if required */ |
190 |
@@ -1905 +1905 @@ |
191 |
- ".L12023: \n\t" "movq (%%eax), %%mm0 \n\t" /* load 8 bytes from SrcDest into MM0 */ |
192 |
+ "1: movq (%%eax), %%mm0 \n\t" /* load 8 bytes from SrcDest into MM0 */ |
193 |
@@ -1911 +1911 @@ |
194 |
- "jnz .L12023 \n\t" /* check loop termination, proceed if required */ |
195 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
196 |
@@ -1984,2 +1984,2 @@ |
197 |
- "jg .L10281 \n\t" ".align 16 \n\t" /* 16 byte allignment of the loop entry */ |
198 |
- ".L10280: \n\t" "movq (%%eax), %%mm3 \n\t" /* load 8 bytes from Src1 into MM3 */ |
199 |
+ "jg 2f \n\t" ".align 16 \n\t" /* 16 byte allignment of the loop entry */ |
200 |
+ "1: movq (%%eax), %%mm3 \n\t" /* load 8 bytes from Src1 into MM3 */ |
201 |
@@ -1996,3 +1996,3 @@ |
202 |
- "jnz .L10280 \n\t" /* check loop termination, proceed if required */ |
203 |
- "jmp .L10282 \n\t" ".align 16 \n\t" /* 16 byte allignment of the loop entry */ |
204 |
- ".L10281: \n\t" "movq (%%eax), %%mm3 \n\t" /* load 8 bytes from Src1 into MM3 */ |
205 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
206 |
+ "jmp 3f \n\t" ".align 16 \n\t" /* 16 byte allignment of the loop entry */ |
207 |
+ "2: movq (%%eax), %%mm3 \n\t" /* load 8 bytes from Src1 into MM3 */ |
208 |
@@ -2018,2 +2018,2 @@ |
209 |
- "jnz .L10281 \n\t" /* check loop termination, proceed if required */ |
210 |
- ".L10282: \n\t" "emms \n\t" /* exit MMX state */ |
211 |
+ "jnz 2b \n\t" /* check loop termination, proceed if required */ |
212 |
+ "3: emms \n\t" /* exit MMX state */ |
213 |
@@ -2098 +2098 @@ |
214 |
- ".L1029: \n\t" |
215 |
+ "1: \n\t" |
216 |
@@ -2106 +2106 @@ |
217 |
- "jnz .L1029 \n\t" /* check loop termination, proceed if required */ |
218 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
219 |
@@ -2189 +2189 @@ |
220 |
- ".L1030: \n\t" |
221 |
+ "1: \n\t" |
222 |
@@ -2198 +2198 @@ |
223 |
- "jnz .L1030 \n\t" /* check loop termination, proceed if required */ |
224 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
225 |
@@ -2266 +2266 @@ |
226 |
- "jz .L10311 \n\t" /* check division by zero */ |
227 |
+ "jz 1f \n\t" /* check division by zero */ |
228 |
@@ -2269,2 +2269,2 @@ |
229 |
- "jmp .L10312 \n\t" ".L10311: \n\t" "mov $255, %%ax \n\t" /* if div by zero, assume result max. byte value */ |
230 |
- ".L10312: \n\t" /* ** Duplicate AX in 4 words of MM0 ** */ |
231 |
+ "jmp 2f \n\t" "1: \n\t" "mov $255, %%ax \n\t" /* if div by zero, assume result max. byte value */ |
232 |
+ "2: \n\t" /* ** Duplicate AX in 4 words of MM0 ** */ |
233 |
@@ -2299 +2299 @@ |
234 |
- ".L1031: \n\t" |
235 |
+ "1: \n\t" |
236 |
@@ -2324 +2324 @@ |
237 |
- "jnz .L1031 \n\t" /* check loop termination, proceed if required */ |
238 |
+ "jnz 1b \n\t" /* check loop termination, proceed if required */ |
239 |
|
240 |
|
241 |
|
242 |
-- |
243 |
gentoo-commits@l.g.o mailing list |