- cmucl-cvs - mailman3.common-lisp.net

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-44-gc65697e
by Raymond Toy 16 Oct '14

16 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via c65697e51b4cd61fc0a760273f4c2ecbcc95ff6a (commit) from bcb27939465ea192186d20aa8801db722dcb1bf4 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit c65697e51b4cd61fc0a760273f4c2ecbcc95ff6a Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Oct 15 19:22:13 2014 -0700 Remove OS_LINK_FLAGS that were creating a CMUCLRO section. They were commented out in 2004/10 so it's way past time to remove them. diff --git a/src/lisp/Config.ppc_darwin b/src/lisp/Config.ppc_darwin index f9d64ef..803970d 100644 --- a/src/lisp/Config.ppc_darwin +++ b/src/lisp/Config.ppc_darwin @@ -47,13 +47,6 @@ OS_SRC += mach-o.c EXEC_FINAL_OBJ = exec-final.o endif -# I (rtoy) am not exactly sure what these values are, but it seems -# that the segaddr for CMUCLRO should be the READ_ONLY_SPACE_START. -# The seg1addr should be somewhere above our spaces. This is where -# the C runtime code goes, I think. -# -# OS_LINK_FLAGS = -g -dynamic -Wl,-sectcreate,CMUCLRO,core,/dev/null -Wl,-segaddr,CMUCLRO,0x01000000 -Wl,-seg1addr,0x1a000000 - # gcc 4.8, (used on zombie) needs -static-libgcc so that the gcc # library is staticly linked into lisp so that the user doesn't need a # matching version of libgcc. ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.ppc_darwin | 7 ------- 1 file changed, 7 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-43-gbcb2793
by Raymond Toy 16 Oct '14

16 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via bcb27939465ea192186d20aa8801db722dcb1bf4 (commit) from b0cf84b5e4fa58f9a50c02e5163fea354829d132 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bcb27939465ea192186d20aa8801db722dcb1bf4 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Wed Oct 15 19:19:37 2014 -0700 Remove darwin-lispadjuster.c and ppc-darwin-dlshim.c Use of ppc-darwin-dlshim.c was removed, but I forgot to remove the file. Use of darwin-lispadjuster.c has been commented out for a while, so I'm getting rid of it. It seems at one point it was needed to resize the CMUCLRO section in the lisp executable, but there is CMUCLRO section anymore. darwin-lispadjuster.c: * Deleted ppc-darwin-dlshim.c: Config.ppc_darwin: * Remove Make rule for adjustlisp and friends. * Remove old commented out version of OS_SRC; we don't use ppc-darwin-dlshim.c anymore. diff --git a/src/lisp/Config.ppc_darwin b/src/lisp/Config.ppc_darwin index dffa756..f9d64ef 100644 --- a/src/lisp/Config.ppc_darwin +++ b/src/lisp/Config.ppc_darwin @@ -39,7 +39,6 @@ ASFLAGS = $(OSX_VERSION) -traditional -g -O3 -DDARWIN -Dppc $(LINKAGE) $(GENCGC) UNDEFSYMPATTERN = -Xlinker -u -Xlinker & ASSEM_SRC = ppc-assem.S linux-stubs.S ARCH_SRC = ppc-arch.c -#OS_SRC = ppc-darwin-dlshim.c os-common.c Darwin-os.c OS_SRC = os-common.c Darwin-os.c @@ -61,11 +60,3 @@ endif OS_LINK_FLAGS = $(OSX_VERSION) -static-libgcc OS_LIBS = -lSystem -lc -lm -#all: adjustlisp -#adjustlisp: lisp darwin-lispadjuster -# ./darwin-lispadjuster lisp -#adjustlisp: lisp darwin-lispadjuster -# true - -#darwin-lispadjuster: darwin-lispadjuster.c - diff --git a/src/lisp/darwin-lispadjuster.c b/src/lisp/darwin-lispadjuster.c deleted file mode 100644 index a18768a..0000000 --- a/src/lisp/darwin-lispadjuster.c +++ /dev/null @@ -1,87 +0,0 @@ -/* Modify the final lisp binary to enlarge the generated CMUCLRO segment */ -#include <stdlib.h> -#include <string.h> -#include <mach-o/loader.h> -#include <sys/types.h> -#include <sys/uio.h> -#include <unistd.h> -#include <fcntl.h> -#include <stdio.h> -#include "validate.h" - -#ifdef DEBUG -#define dprintf printf -#else -#define dprintf(...) -#endif - -int -main(int argc, char **argv) -{ - char *filename; - int fd; - int i, result; - off_t curpos; - struct mach_header theheader; - struct segment_command thesegment; - char segname[17]; - - if (argc != 2) - return 1; - filename = argv[1]; - - fd = open(filename, O_RDWR, 0755); - read(fd, &theheader, sizeof(theheader)); - - if ((theheader.magic != MH_MAGIC) || (theheader.filetype != MH_EXECUTE)) - return 2; - - dprintf("Reading %d commands:\n", theheader.ncmds); - - for (i = 0; i < theheader.ncmds; i++) { - curpos = lseek(fd, 0, SEEK_CUR); - dprintf("Reading command %d (%d bytes):\n", i, - - sizeof(struct load_command)); - read(fd, &thesegment, sizeof(struct load_command)); - - dprintf("Command is %d, length %d\n", thesegment.cmd, - thesegment.cmdsize); - if (thesegment.cmd != LC_SEGMENT) { - dprintf("Skipping remainder of command...\n"); - lseek(fd, thesegment.cmdsize - sizeof(struct load_command), - - SEEK_CUR); - continue; - } - - dprintf("Reading remainder of Segment command (%d bytes)", - sizeof(thesegment) - sizeof(struct load_command)); - read(fd, &thesegment.segname, - - sizeof(thesegment) - sizeof(struct load_command)); - memset(segname, 0, 17); - memcpy(segname, thesegment.segname, 16); - dprintf("Segname: %s\n", segname); - if (0 == strncmp(thesegment.segname, "CMUCLRO", 7)) { - dprintf("Frobbing the segment, setting vmsize from %8X to %8X\n", - thesegment.vmsize, READ_ONLY_SPACE_SIZE); - thesegment.vmsize = READ_ONLY_SPACE_SIZE; - dprintf("Skipping back to %lld.\n", curpos); - lseek(fd, curpos, SEEK_SET); - dprintf("Writing %d bytes.\n", sizeof(thesegment)); - result = write(fd, &thesegment, sizeof(thesegment)); - if (result == -1) - perror("Error:"); - close(fd); - return 0; - } else { - dprintf("Cmdsize = %d, Already read = %d, Now seeking %d\n", - thesegment.cmdsize, sizeof(thesegment), - thesegment.cmdsize - sizeof(thesegment)); - lseek(fd, thesegment.cmdsize - sizeof(thesegment), SEEK_CUR); - } - } - close(fd); - return 3; -} diff --git a/src/lisp/ppc-darwin-dlshim.c b/src/lisp/ppc-darwin-dlshim.c deleted file mode 100644 index e6865cd..0000000 --- a/src/lisp/ppc-darwin-dlshim.c +++ /dev/null @@ -1,236 +0,0 @@ -/* - * These functions emulate a small subset of the dlopen / dlsym - * functionality under Darwin's Mach-O dyld system. - * - * This file was graciously taken from the SBCL OS X/Darwin port, for - * which it was originally written by Brian Mastenbrook: - */ - -/* - * This software is part of the SBCL system. See the README file for - * more information. - * - * This software is derived from the CMU CL system, which was - * written at Carnegie Mellon University and released into the - * public domain. The software is in the public domain and is - * provided with absolutely no warranty. See the COPYING and CREDITS - * files for more information. - */ - - -#include <mach-o/dyld.h> -#include <stdio.h> -#include <stdlib.h> -#include <string.h> - -/* Darwin does not define the standard ELF - * dlopen/dlclose/dlsym/dlerror interface to shared libraries, so this - * is an attempt at a minimal wrapper to allow SBCL to work without - * external dependency on pogma's dlcompat library. - */ - -/* For now, there is no RTLD_GLOBAL emulation either. */ - -static char dl_self; /* I'm going to abuse this */ - -#define RTLD_LAZY 1 -#define RTLD_NOW 2 -#define RTLD_GLOBAL 0x100 - -static int callback_count; -static struct mach_header *last_header; - -void -dlshim_image_callback(struct mach_header *ptr, unsigned long phooey) -{ - callback_count++; - last_header = ptr; -} - -int -lib_path_count(void) -{ - char *libpath; - int i; - int count; - - libpath = getenv("DYLD_LIBRARY_PATH"); - count = 1; - if (libpath) { - for (i = 0; libpath[i] != '\0'; i++) { - if (libpath[i] == ':') - count++; - } - } - return count; -} - -const char * -lib_path_prefixify(int index, const char *filename) -{ - static char *retbuf = NULL; - int fi, li, i, count; - char *libpath; - - if (!retbuf) { - retbuf = (char *) malloc(1024 * sizeof(char)); - } - count = 0; - fi = 0; - li = -1; - libpath = getenv("DYLD_LIBRARY_PATH"); - if (libpath) { - i = 0; - while (count != index && libpath[i] != '\0') { - if (libpath[i] == ':') - count++; - i++; - } - fi = i; - while (libpath[i] != '\0' && libpath[i] != ':') { - i++; - } - li = i - 1; - } - if (li - fi > 0) { - if (li - fi + 1 > 1022 - strlen(filename)) { - retbuf = - (char *) realloc(retbuf, - - (li - fi + 3 + - strlen(filename)) * sizeof(char)); - } - memcpy(retbuf, libpath + fi, (li - fi + 1) * sizeof(char)); - - retbuf[li - fi + 1] = '/'; - memcpy(retbuf + li - fi + 2, filename, strlen(filename) + 1); - return retbuf; - } else { - return filename; - } -} - -void * -dlopen(const char *filename, int flags) -{ - static char has_callback = 0; - - if (!has_callback) { - _dyld_register_func_for_add_image(dlshim_image_callback); - } - if (!filename) { - return &dl_self; - } else { - struct mach_header *img = NULL; - - if (!img) - img = NSAddImage(filename, NSADDIMAGE_OPTION_RETURN_ON_ERROR); - if (!img) - img = - NSAddImage(filename, - NSADDIMAGE_OPTION_RETURN_ON_ERROR | - NSADDIMAGE_OPTION_WITH_SEARCHING); - if (!img) { - NSObjectFileImage fileImage; - - callback_count = 0; - last_header = NULL; - if (NSCreateObjectFileImageFromFile(filename, &fileImage) == - NSObjectFileImageSuccess) { - NSLinkModule(fileImage, filename, - NSLINKMODULE_OPTION_BINDNOW | - ((flags & RTLD_GLOBAL) ? - NSLINKMODULE_OPTION_PRIVATE : 0) | - NSLINKMODULE_OPTION_RETURN_ON_ERROR); - if (callback_count && last_header) - img = last_header; - } - } - if (!img) { - NSObjectFileImage fileImage; - int i, maxi; - char *prefixfilename; - - maxi = lib_path_count(); - for (i = 0; i < maxi && !img; i++) { - prefixfilename = lib_path_prefixify(i, filename); - callback_count = 0; - last_header = NULL; - if (NSCreateObjectFileImageFromFile(prefixfilename, &fileImage) - == NSObjectFileImageSuccess) { - NSLinkModule(fileImage, filename, - NSLINKMODULE_OPTION_BINDNOW | - ((flags & RTLD_GLOBAL) ? - NSLINKMODULE_OPTION_PRIVATE : 0) | - NSLINKMODULE_OPTION_RETURN_ON_ERROR); - if (callback_count && last_header) - img = last_header; - } - } - } - if (img) { - if (flags & RTLD_NOW) { - NSLookupSymbolInImage(img, "", - NSLOOKUPSYMBOLINIMAGE_OPTION_BIND_FULLY | - NSLOOKUPSYMBOLINIMAGE_OPTION_RETURN_ON_ERROR); - } - if (NSIsSymbolNameDefinedInImage(img, "__init")) { - NSSymbol *initsymbol; - void (*initfunc) (void); - - initsymbol = NSLookupSymbolInImage(img, "__init", 0); - initfunc = NSAddressOfSymbol(initsymbol); - initfunc(); - } - } - return img; - } -} - -const char * -dlerror(void) -{ - static char *errbuf = NULL; - NSLinkEditErrors a; - int b; - char *c, *d; - - NSLinkEditError(&a, &b, &c, &d); - if (!errbuf) { - errbuf = (char *) malloc(256 * sizeof(char)); - } - snprintf(errbuf, 255, "%s in %s: %d %d", c, d, a, b); - return errbuf; -} - -void * -dlsym(void *handle, char *symbol) -{ - if (handle == &dl_self) { - if (NSIsSymbolNameDefined(symbol)) { - NSSymbol *retsym; - - retsym = NSLookupAndBindSymbol(symbol); - return NSAddressOfSymbol(retsym); - } else { - return NULL; - } - } else { - if (NSIsSymbolNameDefinedInImage(handle, symbol)) { - NSSymbol *retsym; - - retsym = NSLookupSymbolInImage(handle, symbol, 0); - return NSAddressOfSymbol(retsym); - } else { - return NULL; - } - } -} - -int -dlclose(void *handle) -{ - /* dlclose is not implemented, and never will be for dylibs. - * return -1 to signal an error; it's not used by SBCL anyhow */ - return -1; -} ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.ppc_darwin | 9 -- src/lisp/darwin-lispadjuster.c | 87 --------------- src/lisp/ppc-darwin-dlshim.c | 236 ---------------------------------------- 3 files changed, 332 deletions(-) delete mode 100644 src/lisp/darwin-lispadjuster.c delete mode 100644 src/lisp/ppc-darwin-dlshim.c hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-42-gb0cf84b
by Raymond Toy 14 Oct '14

14 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via b0cf84b5e4fa58f9a50c02e5163fea354829d132 (commit) from 823d6baf4427f342652b014d2416dcdf7be7a21a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit b0cf84b5e4fa58f9a50c02e5163fea354829d132 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Oct 13 20:24:08 2014 -0700 Remove definition of LD. We don't use it and make has default value. diff --git a/src/lisp/Config.ppc_darwin b/src/lisp/Config.ppc_darwin index 871a261..dffa756 100644 --- a/src/lisp/Config.ppc_darwin +++ b/src/lisp/Config.ppc_darwin @@ -14,7 +14,6 @@ CPPFLAGS = -I. -I$(PATH1) # Build for OSX 10.4 or later. (Is this what we want?) OSX_VERSION=-mmacosx-version-min=10.4 CC = gcc -LD = ld NM = $(PATH1)/darwin-nm CPP = cpp DEPEND_FLAGS = -MM diff --git a/src/lisp/Config.x86_common b/src/lisp/Config.x86_common index f0de2ca..dc896ab 100644 --- a/src/lisp/Config.x86_common +++ b/src/lisp/Config.x86_common @@ -49,8 +49,6 @@ ifdef FEATURE_ELF CPP_DEFINE_OPTIONS += -DFEATURE_ELF endif -LD = ld - ifeq ($(filter 2% 3%, $(shell $(CC) -dumpversion)),) CPP_INCLUDE_OPTIONS := -iquote . -iquote $(PATH1) else ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.ppc_darwin | 1 - src/lisp/Config.x86_common | 2 -- 2 files changed, 3 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-41-g823d6ba
by Raymond Toy 11 Oct '14

11 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 823d6baf4427f342652b014d2416dcdf7be7a21a (commit) via 16023de6bde8a83571fb768fed2d7ef481618e72 (commit) from 7765a6f7f8391e45405298d454b6907d5b90683e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 823d6baf4427f342652b014d2416dcdf7be7a21a Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Oct 11 15:08:58 2014 -0700 Update from commit logs. diff --git a/src/general-info/release-21a.txt b/src/general-info/release-21a.txt index d62509c..4b1e86c 100644 --- a/src/general-info/release-21a.txt +++ b/src/general-info/release-21a.txt @@ -23,10 +23,14 @@ New in this release: * Changes * Micro-optimize SCALE-FLOAT to do multiplication when possible. + * Update to ASDF 3.1.4. * ANSI compliance fixes: * Bugfixes: + * On ppc machines with clock speeds over 2 GHz or so, + LISP::CYCLES-PER-TICK is no longer negative. This caused the + cycle count from TIME to be negative. * Trac Tickets: commit 16023de6bde8a83571fb768fed2d7ef481618e72 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Oct 11 15:05:28 2014 -0700 Update to asdf 3.1.4. diff --git a/src/contrib/asdf/asdf.lisp b/src/contrib/asdf/asdf.lisp index 750a886..e478d90 100644 --- a/src/contrib/asdf/asdf.lisp +++ b/src/contrib/asdf/asdf.lisp @@ -1,5 +1,5 @@ ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*- -;;; This is ASDF 3.1.3: Another System Definition Facility. +;;; This is ASDF 3.1.4: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to <asdf-devel(a)common-lisp.net>. @@ -151,7 +151,7 @@ or when loading the package is optional." (defun shadowing-import* (symbol package-designator) (shadowing-import (or symbol (list symbol)) (find-package* package-designator))) (defun shadow* (name package-designator) - (shadow (string name) (find-package* package-designator))) + (shadow (list (string name)) (find-package* package-designator))) (defun make-symbol* (name) (etypecase name (string (make-symbol name)) @@ -1485,7 +1485,7 @@ A symbol otherwise designates a class by name." (or (and found (or (eq super t) (#-cormanlisp subtypep #+cormanlisp cl::subclassp found super)) found) - (call-function error "Can't coerce ~S to a ~@[class~;subclass of ~:*~S]" class super))))) + (call-function error "Can't coerce ~S to a ~:[class~;subclass of ~:*~S~]" class super))))) ;;; Hash-tables @@ -1877,7 +1877,7 @@ suitable for use as a directory name to segregate Lisp FASLs, C dynamic librarie #+ecl (ext:getcwd) #+gcl (let ((*default-pathname-defaults* #p"")) (truename #p"")) #+genera *default-pathname-defaults* ;; on a Lisp OS, it *is* canonical! - #+lispworks (system:current-directory) + #+lispworks (hcl:get-working-directory) #+mkcl (mk-ext:getcwd) #+sbcl (sb-ext:parse-native-namestring (sb-unix:posix-getcwd/)) #+xcl (extensions:current-directory) @@ -1886,19 +1886,21 @@ suitable for use as a directory name to segregate Lisp FASLs, C dynamic librarie (defun chdir (x) "Change current directory, as per POSIX chdir(2), to a given pathname object" (if-let (x (pathname x)) - (or #+abcl (java:jstatic "setProperty" "java.lang.System" "user.dir" (namestring x)) - #+allegro (excl:chdir x) - #+clisp (ext:cd x) - #+clozure (setf (ccl:current-directory) x) - #+(or cmu scl) (unix:unix-chdir (ext:unix-namestring x)) - #+cormanlisp (unless (zerop (win32::_chdir (namestring x))) - (error "Could not set current directory to ~A" x)) - #+ecl (ext:chdir x) - #+genera (setf *default-pathname-defaults* x) - #+lispworks (hcl:change-directory x) - #+mkcl (mk-ext:chdir x) - #+sbcl (progn (require :sb-posix) (symbol-call :sb-posix :chdir (sb-ext:native-namestring x))) - (error "chdir not supported on your implementation"))))) + #+abcl (java:jstatic "setProperty" "java.lang.System" "user.dir" (namestring x)) + #+allegro (excl:chdir x) + #+clisp (ext:cd x) + #+clozure (setf (ccl:current-directory) x) + #+(or cmu scl) (unix:unix-chdir (ext:unix-namestring x)) + #+cormanlisp (unless (zerop (win32::_chdir (namestring x))) + (error "Could not set current directory to ~A" x)) + #+ecl (ext:chdir x) + #+gcl (system:chdir x) + #+genera (setf *default-pathname-defaults* x) + #+lispworks (hcl:change-directory x) + #+mkcl (mk-ext:chdir x) + #+sbcl (progn (require :sb-posix) (symbol-call :sb-posix :chdir (sb-ext:native-namestring x))) + #-(or abcl allegro clisp clozure cmu cormanlisp ecl gcl genera lispworks mkcl sbcl scl) + (error "chdir not supported on your implementation")))) ;;;; ----------------------------------------------------------------- @@ -2340,7 +2342,7 @@ will be treated as part of the directory path. An empty string is thus read as meaning a pathname object with all fields nil. -Note that : characters will NOT be interpreted as host specification. +Note that colon characters #\: will NOT be interpreted as host specification. Absolute pathnames are only appropriate on Unix-style systems. The intention of this function is to support structured component names, @@ -2917,8 +2919,8 @@ This function is used as a helper to DIRECTORY-FILES to avoid invalid entries wh Subdirectories should NOT be returned. PATTERN defaults to a pattern carefully chosen based on the implementation; override the default at your own risk. - DIRECTORY-FILES tries NOT to resolve symlinks if the implementation -permits this." + DIRECTORY-FILES tries NOT to resolve symlinks if the implementation permits this, +but the behavior in presence of symlinks is not portable. Use IOlib to handle such situations." (let ((dir (pathname directory))) (when (logical-pathname-p dir) ;; Because of the filtering we do below, @@ -2944,7 +2946,8 @@ permits this." :version (make-pathname-component-logical (pathname-version f))))))))) (defun subdirectories (directory) - "Given a DIRECTORY pathname designator, return a list of the subdirectories under it." + "Given a DIRECTORY pathname designator, return a list of the subdirectories under it. +The behavior in presence of symlinks is not portable. Use IOlib to handle such situations." (let* ((directory (ensure-directory-pathname directory)) #-(or abcl cormanlisp genera xcl) (wild (merge-pathnames* @@ -2982,14 +2985,17 @@ permits this." :directory (append prefix (make-pathname-component-logical (last dir))))))))))) (defun collect-sub*directories (directory collectp recursep collector) - "Given a DIRECTORY, call-function the COLLECTOR function designator -on the directory if COLLECTP returns true when CALL-FUNCTION'ed with the directory, -and recurse each of its subdirectories on which the RECURSEP returns true when CALL-FUNCTION'ed with them." + "Given a DIRECTORY, when COLLECTP returns true when CALL-FUNCTION'ed with the directory, +call-function the COLLECTOR function designator on the directory, +and recurse each of its subdirectories on which the RECURSEP returns true when CALL-FUNCTION'ed with them. +This function will thus let you traverse a filesystem hierarchy, +superseding the functionality of CL-FAD:WALK-DIRECTORY. +The behavior in presence of symlinks is not portable. Use IOlib to handle such situations." (when (call-function collectp directory) - (call-function collector directory)) - (dolist (subdir (subdirectories directory)) - (when (call-function recursep subdir) - (collect-sub*directories subdir collectp recursep collector))))) + (call-function collector directory) + (dolist (subdir (subdirectories directory)) + (when (call-function recursep subdir) + (collect-sub*directories subdir collectp recursep collector)))))) ;;; Resolving symlinks somewhat (with-upgradability () @@ -3390,7 +3396,7 @@ If you're suicidal or extremely confident, just use :VALIDATE T." #:encoding-external-format #:*encoding-external-format-hook* #:default-encoding-external-format #:*default-encoding* #:*utf-8-external-format* #:with-safe-io-syntax #:call-with-safe-io-syntax #:safe-read-from-string - #:with-output #:output-string #:with-input + #:with-output #:output-string #:with-input #:input-string #:with-input-file #:call-with-input-file #:with-output-file #:call-with-output-file #:null-device-pathname #:call-with-null-input #:with-null-input #:call-with-null-output #:with-null-output @@ -3641,8 +3647,14 @@ Otherwise, signal an error." (defmacro with-input ((input-var &optional (value input-var)) &body body) "Bind INPUT-VAR to an input stream, coercing VALUE (default: previous binding of INPUT-VAR) as per CALL-WITH-INPUT, and evaluate BODY within the scope of this binding." - `(call-with-input ,value #'(lambda (,input-var) ,@body)))) + `(call-with-input ,value #'(lambda (,input-var) ,@body))) + (defun input-string (&optional input) + "If the desired INPUT is a string, return that string; otherwise slurp the INPUT into a string +and return that" + (if (stringp input) + input + (with-input (input) (funcall 'slurp-stream-string input))))) ;;; Null device (with-upgradability () @@ -4293,7 +4305,7 @@ depending on whether *LISP-INTERACTION* is set, enter debugger or die" #+abcl ext:*command-line-argument-list* ; Use 1.0.0 or later! #+allegro (sys:command-line-arguments) ; default: :application t #+clisp (coerce (ext:argv) 'list) - #+clozure (ccl::command-line-arguments) + #+clozure ccl:*command-line-argument-list* #+(or cmu scl) extensions:*command-line-strings* #+ecl (loop :for i :from 0 :below (si:argc) :collect (si:argv i)) #+gcl si:*command-args* @@ -6658,7 +6670,7 @@ previously-loaded version of ASDF." ;; "3.4.5.67" would be a development version in the official branch, on top of 3.4.5. ;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5 ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67 - (asdf-version "3.1.3") + (asdf-version "3.1.4") (existing-version (asdf-version))) (setf *asdf-version* asdf-version) (when (and existing-version (not (equal asdf-version existing-version))) @@ -9017,7 +9029,7 @@ The :FORCE or :FORCE-NOT argument to OPERATE can be: (etypecase operation (operation (let ((name (type-of operation)) (initargs (operation-original-initargs operation))) - #'(lambda () (make-operation name :original-initargs initargs initargs)))) + #'(lambda () (apply 'make-operation name :original-initargs initargs initargs)))) ((or symbol string) (constantly operation)))) (component-path (typecase component ;; to remake the component after ASDF upgrade (component (component-find-path component)) @@ -9519,7 +9531,7 @@ effectively disabling the output translation facility." #:ensure-source-registry #:*source-registry-parameter* #:*default-source-registry-exclusions* #:*source-registry-exclusions* #:*wild-asd* #:directory-asd-files #:register-asd-directory - #:collect-asds-in-directory #:collect-sub*directories-asd-files + #:*recurse-beyond-asds* #:collect-asds-in-directory #:collect-sub*directories-asd-files #:validate-source-registry-directive #:validate-source-registry-form #:validate-source-registry-file #:validate-source-registry-directory #:parse-source-registry-string #:wrapping-source-registry @@ -9565,15 +9577,33 @@ system names to pathnames of .asd files") (directory-files directory *wild-asd*)) (defun collect-asds-in-directory (directory collect) - (map () collect (directory-asd-files directory))) + (let ((asds (directory-asd-files directory))) + (map () collect asds) + asds)) + + (defvar *recurse-beyond-asds* t + "Should :tree entries of the source-registry recurse in subdirectories +after having found a .asd file? True by default.") + + (defun process-source-registry-cache (directory collect) + (let ((cache (ignore-errors + (safe-read-file-form (subpathname directory ".cl-source-registry.cache"))))) + (when (and (listp cache) (eq :source-registry-cache (first cache))) + (loop :for s :in (rest cache) :do (funcall collect (subpathname directory s))) + t))) (defun collect-sub*directories-asd-files - (directory &key (exclude *default-source-registry-exclusions*) collect) + (directory &key (exclude *default-source-registry-exclusions*) collect + (recurse-beyond-asds *recurse-beyond-asds*) ignore-cache) (collect-sub*directories directory - (constantly t) - #'(lambda (x &aux (l (car (last (pathname-directory x))))) (not (member l exclude :test #'equal))) - #'(lambda (dir) (collect-asds-in-directory dir collect)))) + #'(lambda (dir) + (unless (and (not ignore-cache) (process-source-registry-cache directory collect)) + (let ((asds (collect-asds-in-directory dir collect))) + (or recurse-beyond-asds (not asds))))) + #'(lambda (x) + (not (member (car (last (pathname-directory x))) exclude :test #'equal))) + (constantly nil))) (defun validate-source-registry-directive (directive) (or (member directive '(:default-registry)) @@ -9729,7 +9759,8 @@ system names to pathnames of .asd files") ((:also-exclude) (appendf *source-registry-exclusions* rest)) ((:default-registry) - (inherit-source-registry '(default-source-registry) :register register)) + (inherit-source-registry + '(default-user-source-registry default-system-source-registry) :register register)) ((:inherit-configuration) (inherit-source-registry inherit :register register)) ((:ignore-inherited-configuration) @@ -10187,7 +10218,6 @@ system names contained using COERCE-NAME. Return the result." #:bundle-op #:bundle-type #:program-system #:bundle-system #:bundle-pathname-type #:bundlable-file-p #:direct-dependency-files #:monolithic-op #:monolithic-bundle-op #:operation-monolithic-p - #:fasl-op #:load-fasl-op #:monolithic-fasl-op #:binary-op #:monolithic-binary-op #:basic-compile-bundle-op #:prepare-bundle-op #:compile-bundle-op #:load-bundle-op #:monolithic-compile-bundle-op #:monolithic-load-bundle-op #:lib-op #:monolithic-lib-op @@ -10648,6 +10678,11 @@ itself.")) ;; operation on a system and its dependencies ;;(unless (or #+ecl (use-ecl-byte-compiler-p)) ;; (setf *load-system-operation* 'load-bundle-op)) + (defun uiop-library-pathname () + #+ecl (or (probe-file* (compile-file-pathname "sys:uiop" :type :lib)) ;; new style + (probe-file* (compile-file-pathname "sys:uiop" :type :object))) ;; old style + #+mkcl (make-pathname :type (bundle-pathname-type :lib) :defaults #p"sys:contrib;uiop")) + (defun asdf-library-pathname () #+ecl (or (probe-file* (compile-file-pathname "sys:asdf" :type :lib)) ;; new style (probe-file* (compile-file-pathname "sys:asdf" :type :object))) ;; old style @@ -10669,10 +10704,12 @@ itself.")) ;; operation on a system and its dependencies `(,(make-library-system "cmp" (compiler-library-pathname)))) ,@(unless (or (no-uiop c) (has-it-p "uiop") (has-it-p "asdf")) - `(,(cond - ((system-source-directory :uiop) (find-system :uiop)) - ((system-source-directory :asdf) (find-system :asdf)) - (t (make-library-system "asdf" (asdf-library-pathname)))))) + `(cond + ((system-source-directory :uiop) `(,(find-system :uiop))) + ((system-source-directory :asdf) `(,(find-system :asdf))) + (t `(,@(if-let (uiop (uiop-library-pathname)) + `(,(make-library-system "uiop" uiop))) + ,(make-library-system "asdf" (asdf-library-pathname)))))) ,@deps))))) (defmethod perform ((o link-op) (c system)) @@ -10707,18 +10744,18 @@ Please report to ASDF-DEVEL if this works for you."))) ;;; Backward compatibility with pre-3.1.2 names -(defclass fasl-op (selfward-operation) - ((selfward-operation :initform 'compile-bundle-op :allocation :class))) -(defclass load-fasl-op (selfward-operation) - ((selfward-operation :initform 'load-bundle-op :allocation :class))) -(defclass binary-op (selfward-operation) - ((selfward-operation :initform 'deliver-asd-op :allocation :class))) -(defclass monolithic-fasl-op (selfward-operation) - ((selfward-operation :initform 'monolithic-compile-bundle-op :allocation :class))) -(defclass monolithic-load-fasl-op (selfward-operation) - ((selfward-operation :initform 'monolithic-load-bundle-op :allocation :class))) -(defclass monolithic-binary-op (selfward-operation) - ((selfward-operation :initform 'monolithic-deliver-asd-op :allocation :class))) +;; (defclass fasl-op (selfward-operation) +;; ((selfward-operation :initform 'compile-bundle-op :allocation :class))) +;; (defclass load-fasl-op (selfward-operation) +;; ((selfward-operation :initform 'load-bundle-op :allocation :class))) +;; (defclass binary-op (selfward-operation) +;; ((selfward-operation :initform 'deliver-asd-op :allocation :class))) +;; (defclass monolithic-fasl-op (selfward-operation) +;; ((selfward-operation :initform 'monolithic-compile-bundle-op :allocation :class))) +;; (defclass monolithic-load-fasl-op (selfward-operation) +;; ((selfward-operation :initform 'monolithic-load-bundle-op :allocation :class))) +;; (defclass monolithic-binary-op (selfward-operation) +;; ((selfward-operation :initform 'monolithic-deliver-asd-op :allocation :class))) ;;;; ------------------------------------------------------------------------- ;;;; Concatenate-source @@ -11155,7 +11192,6 @@ otherwise return a default system name computed from PACKAGE-NAME." #:component-load-dependencies #:run-shell-command ; deprecated, do not use #:bundle-op #:monolithic-bundle-op #:precompiled-system #:compiled-file #:bundle-system #:program-system #:make-build - #:fasl-op #:load-fasl-op #:monolithic-fasl-op #:binary-op #:monolithic-binary-op #:basic-compile-bundle-op #:prepare-bundle-op #:compile-bundle-op #:load-bundle-op #:monolithic-compile-bundle-op #:monolithic-load-bundle-op #:lib-op #:dll-op #:deliver-asd-op #:program-op #:image-op @@ -11306,7 +11342,8 @@ otherwise return a default system name computed from PACKAGE-NAME." (uiop/package:define-package :asdf/footer (:recycle :asdf/footer :asdf) - (:use :uiop/common-lisp :uiop :asdf/upgrade :asdf/operate :asdf/bundle)) + (:use :uiop/common-lisp :uiop + :asdf/upgrade :asdf/find-system :asdf/operate :asdf/bundle)) (in-package :asdf/footer) ;;;; Hook ASDF into the implementation's REQUIRE and other entry points. @@ -11336,7 +11373,7 @@ otherwise return a default system name computed from PACKAGE-NAME." (if (eq f 'module-provide-asdf) f #'(lambda (name) (let ((l (multiple-value-list (funcall f name)))) - (and (first l) (register-pre-built-system (coerce-name name))) + (and (first l) (register-preloaded-system (coerce-name name))) (values-list l)))))))) #+cmu ;; Hook into the CMUCL herald. @@ -11361,4 +11398,3 @@ otherwise return a default system name computed from PACKAGE-NAME." (when *load-verbose* (asdf-message ";; ASDF, version ~a~%" (asdf-version))) - ----------------------------------------------------------------------- Summary of changes: src/contrib/asdf/asdf.lisp | 158 +++++++++++++++++++++++--------------- src/general-info/release-21a.txt | 4 + 2 files changed, 101 insertions(+), 61 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-39-g7765a6f
by Raymond Toy 11 Oct '14

11 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via 7765a6f7f8391e45405298d454b6907d5b90683e (commit) from da20092cfc5da4fd78ef37d2d1d1a06ea9f08f8d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 7765a6f7f8391e45405298d454b6907d5b90683e Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Oct 10 21:43:09 2014 -0700 Fix compiler warning for skipped_break_addr Change skipped_break_addr to unsigned int* instead of unsigned long* and remove cast from pc to store in skipped_break_addr. diff --git a/src/lisp/ppc-arch.c b/src/lisp/ppc-arch.c index c46b99c..008a458 100644 --- a/src/lisp/ppc-arch.c +++ b/src/lisp/ppc-arch.c @@ -117,7 +117,7 @@ arch_remove_breakpoint(void *pc, unsigned long orig_inst) os_flush_icache((os_vm_address_t) pc, sizeof(unsigned long)); } -static unsigned long *skipped_break_addr, displaced_after_inst; +static unsigned int *skipped_break_addr, displaced_after_inst; static sigset_t orig_sigmask; void @@ -133,7 +133,7 @@ arch_do_displaced_inst(os_context_t * scp, unsigned long orig_inst) *pc = orig_inst; os_flush_icache((os_vm_address_t) pc, sizeof(unsigned int)); - skipped_break_addr = (unsigned long) pc; + skipped_break_addr = pc; /* * Replace the next instruction with a ----------------------------------------------------------------------- Summary of changes: src/lisp/ppc-arch.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch master updated. 20f-38-gda20092
by Raymond Toy 11 Oct '14

11 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, master has been updated via da20092cfc5da4fd78ef37d2d1d1a06ea9f08f8d (commit) via 1addd336c589019861798242732ab6d2c99ffe05 (commit) via bd66559a30189bee02e7357d365f7317670ae0c1 (commit) via 6172c8a71aacbd894dff622a0dd9d593c10a8e48 (commit) via 434078e9e8a7b7b3069c0cf6e6f618807823f41a (commit) via a1946b35f37aef46677676e2696304ab6b405788 (commit) via 571dd4904fc88cad51c9c2dee0b3e6ed6ef9ce12 (commit) from 57711cc2167f4fc4dc5a03f1b7e3b43e5c7e8050 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- ----------------------------------------------------------------------- Summary of changes: src/bootfiles/20f/boot-20f-cross-x86.lisp | 9 ++++++ src/code/ppc-vm.lisp | 2 +- src/code/sparc-svr4-vm.lisp | 1 + src/code/x86-vm.lisp | 3 ++ src/compiler/generic/new-genesis.lisp | 2 +- src/lisp/Config.sparc_common | 16 ++++++---- src/lisp/Config.x86_common | 4 +++ src/lisp/Darwin-os.c | 24 ++++++++------- src/lisp/os-common.c | 34 ++++++++++++++------- src/tools/cross-scripts/cross-ppc-ppc-darwin.lisp | 4 +-- src/tools/cross-scripts/cross-x86-x86.lisp | 3 ++ 11 files changed, 70 insertions(+), 32 deletions(-) create mode 100644 src/bootfiles/20f/boot-20f-cross-x86.lisp hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch rtoy-extern-alien-name updated. 20f-38-gda20092
by Raymond Toy 11 Oct '14

11 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, rtoy-extern-alien-name has been updated via da20092cfc5da4fd78ef37d2d1d1a06ea9f08f8d (commit) from 1addd336c589019861798242732ab6d2c99ffe05 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit da20092cfc5da4fd78ef37d2d1d1a06ea9f08f8d Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Oct 10 20:19:05 2014 -0700 Add :elf to *features* for sparc/solaris. diff --git a/src/code/sparc-svr4-vm.lisp b/src/code/sparc-svr4-vm.lisp index 5c92b96..1368fb2 100644 --- a/src/code/sparc-svr4-vm.lisp +++ b/src/code/sparc-svr4-vm.lisp @@ -128,6 +128,7 @@ (pushnew :sparc *features*) (pushnew :sun4 *features*) (pushnew :svr4 *features*) +(sys:register-lisp-feature :elf) ;; There's SVR4 by Sun called Solaris 2, there's the SVR4 reference port by ;; ICL that runs on ICL's own DRS 6000s. #+sunos ----------------------------------------------------------------------- Summary of changes: src/code/sparc-svr4-vm.lisp | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch rtoy-extern-alien-name updated. 20f-37-g1addd33
by Raymond Toy 11 Oct '14

11 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, rtoy-extern-alien-name has been updated via 1addd336c589019861798242732ab6d2c99ffe05 (commit) from bd66559a30189bee02e7357d365f7317670ae0c1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1addd336c589019861798242732ab6d2c99ffe05 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Oct 10 20:18:25 2014 -0700 Add boot file for the darwin/x86 cross-compile that is used to fix the extern-alien-name issue so darwin/x86 matches darwin/ppc. diff --git a/src/bootfiles/20f/boot-20f-cross-x86.lisp b/src/bootfiles/20f/boot-20f-cross-x86.lisp new file mode 100644 index 0000000..d1f3367 --- /dev/null +++ b/src/bootfiles/20f/boot-20f-cross-x86.lisp @@ -0,0 +1,9 @@ +;;; Cross-compile script to update extern-alien-name for +;;; darwin/x86. This makes extern-alien-name on darwin/x86 match +;;; darwin/ppc, where an underscore is prepended. +;;; +;;; A cross-compile might not truly be necessary, but this is known to +;;; work. + +#+(and darwin x86) +(load "target:tools/cross-scripts/cross-x86-x86.lisp") ----------------------------------------------------------------------- Summary of changes: src/bootfiles/20f/boot-20f-cross-x86.lisp | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/bootfiles/20f/boot-20f-cross-x86.lisp hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch rtoy-extern-alien-name updated. 20f-36-gbd66559
by Raymond Toy 11 Oct '14

11 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, rtoy-extern-alien-name has been updated via bd66559a30189bee02e7357d365f7317670ae0c1 (commit) from 6172c8a71aacbd894dff622a0dd9d593c10a8e48 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit bd66559a30189bee02e7357d365f7317670ae0c1 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Oct 10 19:42:14 2014 -0700 For sparc, define FEATURE_ELF because Solaris uses elf. This is needed on sparc to define the right EXTERN_ALIEN_NAME. diff --git a/src/lisp/Config.sparc_common b/src/lisp/Config.sparc_common index 2ad8aed..9a7c850 100644 --- a/src/lisp/Config.sparc_common +++ b/src/lisp/Config.sparc_common @@ -15,15 +15,16 @@ vpath %.pot $(CMULOCALE) vpath %.po $(CMULOCALE) vpath %.mo $(CMULOCALE) +CPP_DEFINE_OPTIONS := -DSOLARIS -DSVR4 # Enable support for :linkage-table feature. ifdef FEATURE_LINKAGE_TABLE -LINKAGE = -DLINKAGE_TABLE +CPP_DEFINE_OPTIONS += -DLINKAGE_TABLE endif # Enable support for generational GC ifdef FEATURE_GENCGC -GENCGC = -DGENCGC +CPP_DEFINE_OPTIONS += -DGENCGC GC_SRC = gencgc.c else GC_SRC = gc.c @@ -34,19 +35,22 @@ endif # cases. If neither is set, then we don't want any SSE2 support at # all. ifdef FEATURE_X87 -SSE2 = -DFEATURE_SSE2 +CPP_DEFINE_OPTIONS += -DFEATURE_SSE2 else ifdef FEATURE_SSE2 -SSE2 = -DFEATURE_SSE2 +CPP_DEFINE_OPTIONS += -DFEATURE_SSE2 endif endif # Enable support for Unicode ifdef FEATURE_UNICODE -UNICODE = -DUNICODE +CPP_DEFINE_OPTIONS += -DUNICODE endif -CPPFLAGS += -I. -I$(PATH1) -DSOLARIS -DSVR4 $(CC_V8PLUS) $(LINKAGE) $(GENCGC) $(UNICODE) $(SSE2) +# Sparc is always elf. +CPP_DEFINE_OPTIONS += -DFEATURE_ELF + +CPPFLAGS += -I. -I$(PATH1) $(CC_V8PLUS) $(CPP_DEFINE_OPTIONS) CFLAGS += -g $(CC_V8PLUS) ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.sparc_common | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[Cmucl-cvs] [git] CMU Common Lisp branch rtoy-extern-alien-name updated. 20f-35-g6172c8a
by Raymond Toy 11 Oct '14

11 Oct '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMU Common Lisp". The branch, rtoy-extern-alien-name has been updated via 6172c8a71aacbd894dff622a0dd9d593c10a8e48 (commit) from 434078e9e8a7b7b3069c0cf6e6f618807823f41a (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 6172c8a71aacbd894dff622a0dd9d593c10a8e48 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Oct 10 19:40:37 2014 -0700 For x86, define FEATURE_ELF if needed. And this is definitely needed now on Linux at least to define the right EXTERN_ALIEN_NAME. diff --git a/src/lisp/Config.x86_common b/src/lisp/Config.x86_common index ee06a1a..f0de2ca 100644 --- a/src/lisp/Config.x86_common +++ b/src/lisp/Config.x86_common @@ -45,6 +45,10 @@ ifdef FEATURE_UNICODE CPP_DEFINE_OPTIONS += -DUNICODE endif +ifdef FEATURE_ELF +CPP_DEFINE_OPTIONS += -DFEATURE_ELF +endif + LD = ld ifeq ($(filter 2% 3%, $(shell $(CC) -dumpversion)),) ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.x86_common | 4 ++++ 1 file changed, 4 insertions(+) hooks/post-receive -- CMU Common Lisp

1 0