Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andrey Grozin (grozin)" <grozin@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in dev-lisp/cmucl/files: 20b-patch001.patch 20b-nositeinit-build.patch 20b-customize-lisp-implementation-version.patch 20b-execstack-fixes.patch site-init.lisp.in
Date: Thu, 28 Apr 2011 20:21:45
Message-Id: 20110428202133.B12E020054@flycatcher.gentoo.org
1 grozin 11/04/28 20:21:33
2
3 Modified: site-init.lisp.in
4 Added: 20b-patch001.patch 20b-nositeinit-build.patch
5 20b-customize-lisp-implementation-version.patch
6 20b-execstack-fixes.patch
7 Log:
8 Version bump from the lisp overlay
9
10 (Portage version: 2.2.0_alpha30/cvs/Linux i686)
11
12 Revision Changes Path
13 1.2 dev-lisp/cmucl/files/site-init.lisp.in
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/site-init.lisp.in?rev=1.2&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/site-init.lisp.in?rev=1.2&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/site-init.lisp.in?r1=1.1&r2=1.2
18
19 Index: site-init.lisp.in
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/files/site-init.lisp.in,v
22 retrieving revision 1.1
23 retrieving revision 1.2
24 diff -u -r1.1 -r1.2
25 --- site-init.lisp.in 27 May 2010 00:47:18 -0000 1.1
26 +++ site-init.lisp.in 28 Apr 2011 20:21:33 -0000 1.2
27 @@ -12,10 +12,6 @@
28
29 (in-package "SYSTEM")
30
31 -(ext:without-package-locks
32 - (defun lisp-implementation-version ()
33 - (format nil "~X-~A" c:byte-fasl-file-version "@VERSION@")))
34 -
35 (if (probe-file "/etc/cmuclrc")
36 (load "/etc/cmuclrc")
37 (format t "~%;;; Warning: There is no /etc/cmuclrc file (which should have been created during emerge"))
38
39
40
41 1.1 dev-lisp/cmucl/files/20b-patch001.patch
42
43 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20b-patch001.patch?rev=1.1&view=markup
44 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20b-patch001.patch?rev=1.1&content-type=text/plain
45
46 Index: 20b-patch001.patch
47 ===================================================================
48 Author: Raymond Toy <rtoy@×××××××××××.net>
49 Date: 2010-11-02
50 Status: Upstream
51 Description: Fixes bug in SSE2 VOP for COMPLEX arrays
52
53 diff -ru cmucl.orig//src/compiler/x86/float-sse2.lisp cmucl/src/compiler/x86/float-sse2.lisp
54 --- cmucl.orig//src/compiler/x86/float-sse2.lisp 2010-08-15 17:09:41.000000000 +0200
55 +++ cmucl/src/compiler/x86/float-sse2.lisp 2010-11-01 13:41:54.860889371 +0100
56 @@ -7,7 +7,7 @@
57 ;;; Scott Fahlman or slisp-group@××××××.edu.
58 ;;;
59 (ext:file-comment
60 - "$Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/files/20b-patch001.patch,v 1.1 2011/04/28 20:21:33 grozin Exp $")
61 + "$Header: /var/cvsroot/gentoo-x86/dev-lisp/cmucl/files/20b-patch001.patch,v 1.1 2011/04/28 20:21:33 grozin Exp $")
62 ;;;
63 ;;; **********************************************************************
64 ;;;
65 @@ -1390,13 +1390,19 @@
66 (:arg-types complex-single-float)
67 (:results (r :scs (single-reg)))
68 (:result-types single-float)
69 + (:temporary (:sc single-reg) temp)
70 (:policy :fast-safe)
71 (:note _N"complex float realpart")
72 (:generator 3
73 (sc-case x
74 (complex-single-reg
75 - (inst xorps r r) ; temp = 0|0|0|0
76 - (inst movss r x)) ; r = 0|0|0|x
77 + (cond ((location= r x)
78 + (inst xorps temp temp) ; temp = 0|0|0|0
79 + (inst movss temp x) ; temp = 0|0|0|x
80 + (inst movss r temp)) ; r = temp
81 + (t
82 + (inst xorps r r) ; temp = 0|0|0|0
83 + (inst movss r x)))) ; r = 0|0|0|x
84 (complex-single-stack
85 (inst movss r (ea-for-csf-real-stack x)))
86 (descriptor-reg
87 @@ -1408,13 +1414,19 @@
88 (:arg-types complex-double-float)
89 (:results (r :scs (double-reg)))
90 (:result-types double-float)
91 + (:temporary (:sc double-reg) temp)
92 (:policy :fast-safe)
93 - (:note _N"complex float realpart")
94 + (:note "complex float realpart")
95 (:generator 3
96 (sc-case x
97 (complex-double-reg
98 - (inst xorpd r r) ; temp = 0|0
99 - (inst movsd r x)) ; r = 0|x
100 + (cond ((location= r x)
101 + (inst xorpd temp temp) ; temp = 0|0
102 + (inst movsd temp x) ; temp = 0|x
103 + (inst movsd r temp)) ; r = temp
104 + (t
105 + (inst xorpd r r) ; r = 0|0
106 + (inst movsd r x)))) ; r = 0|x
107 (complex-double-stack
108 (inst movsd r (ea-for-cdf-real-stack x)))
109 (descriptor-reg
110 @@ -1457,8 +1469,13 @@
111 (:generator 3
112 (sc-case x
113 (complex-double-reg
114 - (inst xorpd r r) ; r = 0|0
115 - (inst movhlps r x)) ; r = 0|b
116 + (cond ((location= r x)
117 + (inst xorpd temp temp) ; temp = 0|0
118 + (inst movhlps temp x) ; temp = 0|b
119 + (inst movsd r temp)) ; r = temp
120 + (t
121 + (inst xorpd r r) ; r = 0|0
122 + (inst movhlps r x)))) ; r = 0|b
123 (complex-double-stack
124 (inst movsd r (ea-for-cdf-imag-stack x)))
125 (descriptor-reg
126 @@ -1835,7 +1852,7 @@
127 (convert-complex %complex-single-float cvtpd2ps complex-single complex-double))
128
129 (macrolet
130 - ((convert-complex (trans op base-ea to from)
131 + ((convert-complex (trans op base-ea to from movinst)
132 (let ((name (symbolicate to "/" from))
133 (from-sc (symbolicate from "-REG"))
134 (from-sc-stack (symbolicate from "-STACK"))
135 @@ -1849,21 +1866,27 @@
136 (:arg-types ,from-type)
137 (:results (r :scs (,to-sc)))
138 (:result-types ,to-type)
139 + (:temporary (:sc ,to-sc) temp)
140 (:policy :fast-safe)
141 (:generator 1
142 (sc-case x
143 (,from-sc
144 ;; Need to make sure the imaginary part is zero
145 - (inst xorps r r)
146 - (inst ,op r x))
147 + (cond ((location= x r)
148 + (inst xorps temp temp)
149 + (inst ,op temp x)
150 + (inst ,movinst r temp))
151 + (t
152 + (inst xorps r r)
153 + (inst ,op r x))))
154 (,from-sc-stack
155 (inst xorps r r)
156 (inst ,op r (,(symbolicate "EA-FOR-" base-ea "-STACK") x)))
157 (descriptor-reg
158 (inst xorps r r)
159 (inst ,op r (,(symbolicate "EA-FOR-" base-ea "-DESC") x)))))))))
160 - (convert-complex %complex-double-float cvtss2sd sf complex-double single)
161 - (convert-complex %complex-single-float cvtsd2ss df complex-single double))
162 + (convert-complex %complex-double-float cvtss2sd sf complex-double single movapd)
163 + (convert-complex %complex-single-float cvtsd2ss df complex-single double movaps))
164
165 ;; Add and subtract for two complex arguments
166 (macrolet
167
168
169
170 1.1 dev-lisp/cmucl/files/20b-nositeinit-build.patch
171
172 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20b-nositeinit-build.patch?rev=1.1&view=markup
173 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20b-nositeinit-build.patch?rev=1.1&content-type=text/plain
174
175 Index: 20b-nositeinit-build.patch
176 ===================================================================
177 Author: Stelian Ionescu <sionescu@××××.org>
178 Date: 2010-11-03
179 Status: Upstream
180 Description: Avoids loading the site init during build
181
182 diff -ur cmucl.orig//src/tools/build.sh cmucl/src/tools/build.sh
183 --- cmucl.orig//src/tools/build.sh 2010-09-02 18:16:18.000000000 +0200
184 +++ cmucl/src/tools/build.sh 2010-11-03 15:57:06.615611658 +0100
185 @@ -126,7 +126,8 @@
186 fi
187 $TOOLDIR/load-world.sh $TARGET "$VERSION" || { echo "Failed: $TOOLDIR/load-world.sh"; exit 1; }
188
189 - $TARGET/lisp/lisp -batch -noinit $FPU_MODE < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; }
190 + $TARGET/lisp/lisp -batch -noinit -nositeinit $FPU_MODE < /dev/null || \
191 + { echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; }
192 return 0;
193 fi
194 }
195
196
197
198 1.1 dev-lisp/cmucl/files/20b-customize-lisp-implementation-version.patch
199
200 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20b-customize-lisp-implementation-version.patch?rev=1.1&view=markup
201 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20b-customize-lisp-implementation-version.patch?rev=1.1&content-type=text/plain
202
203 Index: 20b-customize-lisp-implementation-version.patch
204 ===================================================================
205 diff -ur cmucl.orig/src/code/misc.lisp cmucl/src/code/misc.lisp
206 --- cmucl.orig/src/code/misc.lisp 2010-04-20 19:57:45.000000000 +0200
207 +++ cmucl/src/code/misc.lisp 2010-10-15 02:15:53.064623104 +0200
208 @@ -181,8 +181,10 @@
209
210 (defun lisp-implementation-version ()
211 "Returns a string describing the implementation version."
212 - (format nil "~A (~X~A)" *lisp-implementation-version* c:byte-fasl-file-version
213 - #+unicode (intl:gettext " Unicode") #-unicode ""))
214 + (format nil "~X~A~A"
215 + c:byte-fasl-file-version
216 + #+unicode "-unicode" #-unicode ""
217 + *lisp-implementation-version*))
218
219 (defun machine-instance ()
220 "Returns a string giving the name of the local machine."
221
222
223
224 1.1 dev-lisp/cmucl/files/20b-execstack-fixes.patch
225
226 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20b-execstack-fixes.patch?rev=1.1&view=markup
227 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lisp/cmucl/files/20b-execstack-fixes.patch?rev=1.1&content-type=text/plain
228
229 Index: 20b-execstack-fixes.patch
230 ===================================================================
231 diff -Naur work.old/src/lisp/alpha-assem.S work/src/lisp/alpha-assem.S
232 --- work.old/src/lisp/alpha-assem.S 2003-03-06 11:13:09.000000000 -0300
233 +++ work/src/lisp/alpha-assem.S 2010-05-10 00:06:34.000000000 -0300
234 @@ -297,3 +297,7 @@
235 function_end_breakpoint_end:
236
237
238 +
239 +#if defined(__linux__) && defined(__ELF__)
240 +.section .note.GNU-stack,"",%progbits
241 +#endif
242 diff -Naur work.old/src/lisp/amd64-assem.S work/src/lisp/amd64-assem.S
243 --- work.old/src/lisp/amd64-assem.S 2004-07-27 19:03:53.000000000 -0300
244 +++ work/src/lisp/amd64-assem.S 2010-05-10 00:06:34.000000000 -0300
245 @@ -1051,3 +1051,7 @@
246 .end
247
248 #endif /* LINKAGE_TABLE */
249 +
250 +#if defined(__linux__) && defined(__ELF__)
251 +.section .note.GNU-stack,"",%progbits
252 +#endif
253 diff -Naur work.old/src/lisp/backtrace.c work/src/lisp/backtrace.c
254 --- work.old/src/lisp/backtrace.c 2009-06-11 13:04:01.000000000 -0300
255 +++ work/src/lisp/backtrace.c 2010-05-10 00:06:22.000000000 -0300
256 @@ -3,6 +3,8 @@
257 * Simple backtrace facility. More or less from Rob's lisp version.
258 */
259
260 +#include "os-common.h"
261 +
262 #include <stdio.h>
263 #include <signal.h>
264 #include "lisp.h"
265 diff -Naur work.old/src/lisp/hppa-assem.S work/src/lisp/hppa-assem.S
266 --- work.old/src/lisp/hppa-assem.S 2002-08-23 14:05:35.000000000 -0300
267 +++ work/src/lisp/hppa-assem.S 2010-05-10 00:06:34.000000000 -0300
268 @@ -460,3 +460,7 @@
269
270 .export function_end_breakpoint_end
271 function_end_breakpoint_end
272 +
273 +#if defined(__linux__) && defined(__ELF__)
274 +.section .note.GNU-stack,"",%progbits
275 +#endif
276 diff -Naur work.old/src/lisp/linux-stubs.S work/src/lisp/linux-stubs.S
277 --- work.old/src/lisp/linux-stubs.S 2005-08-17 00:40:16.000000000 -0300
278 +++ work/src/lisp/linux-stubs.S 2010-05-10 00:06:34.000000000 -0300
279 @@ -995,3 +995,7 @@
280 /* doe(yperr_string) */
281 /* doe(ypprot_err) */
282 #endif /* defined(LINKAGE_TABLE) && !defined(__FreeBSD__) */
283 +
284 +#if defined(__linux__) && defined(__ELF__)
285 +.section .note.GNU-stack,"",%progbits
286 +#endif
287 diff -Naur work.old/src/lisp/lisp.c work/src/lisp/lisp.c
288 --- work.old/src/lisp/lisp.c 2009-07-13 16:41:54.000000000 -0300
289 +++ work/src/lisp/lisp.c 2010-05-10 00:05:55.000000000 -0300
290 @@ -5,6 +5,9 @@
291 *
292 */
293
294 +#include "os-common.h"
295 +#include <time.h>
296 +
297 #include <stdio.h>
298 #include <stdlib.h>
299 #include <limits.h>
300 diff -Naur work.old/src/lisp/mips-assem.S work/src/lisp/mips-assem.S
301 --- work.old/src/lisp/mips-assem.S 2002-08-23 14:01:02.000000000 -0300
302 +++ work/src/lisp/mips-assem.S 2010-05-10 00:06:34.000000000 -0300
303 @@ -402,3 +402,7 @@
304 move v0, a1
305 j _restore_state
306 .end save_state
307 +
308 +#if defined(__linux__) && defined(__ELF__)
309 +.section .note.GNU-stack,"",%progbits
310 +#endif
311 diff -Naur work.old/src/lisp/os-common.h work/src/lisp/os-common.h
312 --- work.old/src/lisp/os-common.h 1969-12-31 21:00:00.000000000 -0300
313 +++ work/src/lisp/os-common.h 2010-05-10 00:06:22.000000000 -0300
314 @@ -0,0 +1 @@
315 +char* convert_lisp_string(char *c_string, void *lisp_string, int len);
316 diff -Naur work.old/src/lisp/ppc-assem.S work/src/lisp/ppc-assem.S
317 --- work.old/src/lisp/ppc-assem.S 2006-02-25 01:35:58.000000000 -0300
318 +++ work/src/lisp/ppc-assem.S 2010-05-10 00:06:34.000000000 -0300
319 @@ -721,3 +721,7 @@
320 SET_SIZE(fpu_restore)
321
322 #endif
323 +
324 +#if defined(__linux__) && defined(__ELF__)
325 +.section .note.GNU-stack,"",%progbits
326 +#endif
327 diff -Naur work.old/src/lisp/sparc-assem.S work/src/lisp/sparc-assem.S
328 --- work.old/src/lisp/sparc-assem.S 2003-10-23 23:57:00.000000000 -0300
329 +++ work/src/lisp/sparc-assem.S 2010-05-10 00:06:34.000000000 -0300
330 @@ -837,3 +837,7 @@
331 * End:
332 */
333
334 +
335 +#if defined(__linux__) && defined(__ELF__)
336 +.section .note.GNU-stack,"",%progbits
337 +#endif
338 diff -Naur work.old/src/lisp/x86-assem.S work/src/lisp/x86-assem.S
339 --- work.old/src/lisp/x86-assem.S 2008-12-24 02:36:40.000000000 -0200
340 +++ work/src/lisp/x86-assem.S 2010-05-10 00:06:34.000000000 -0300
341 @@ -798,3 +798,7 @@
342 ENDFUNC(undefined_foreign_symbol_trap)
343
344 #endif /* LINKAGE_TABLE */
345 +
346 +#if defined(__linux__) && defined(__ELF__)
347 +.section .note.GNU-stack,"",%progbits
348 +#endif
Report Message
Find on MARC Find on Google Groups