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

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-02-18-g74c59b7
by Raymond Toy 24 Feb '12

24 Feb '12

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 74c59b7679c19e07fa0866c4aeb1d652856a7ed9 (commit) from 8895c013f61f55b8e561e0efa56962038b578213 (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 74c59b7679c19e07fa0866c4aeb1d652856a7ed9 Author: Raymond Toy <rtoy(a)google.com> Date: Fri Feb 24 09:22:58 2012 -0800 Oops. Always write the fpu mode to the core file on x86. (Previously only wrote the mode when compiling with sse2.) diff --git a/src/compiler/generic/new-genesis.lisp b/src/compiler/generic/new-genesis.lisp index ee417f4..9523d41 100644 --- a/src/compiler/generic/new-genesis.lisp +++ b/src/compiler/generic/new-genesis.lisp @@ -2928,9 +2928,8 @@ ;; For x86, identify the core as using either x87 or sse2 ;; instructions. - (cond ((and (eql (c:backend-fasl-file-implementation c:*backend*) - c:x86-fasl-file-implementation) - (c:backend-featurep :sse2)) + (cond ((eql (c:backend-fasl-file-implementation c:*backend*) + c:x86-fasl-file-implementation) (write-long 4) (write-long version) ;; See the definition of fpu_mode_t in lisp.h for correct ----------------------------------------------------------------------- Summary of changes: src/compiler/generic/new-genesis.lisp | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-02-17-g8895c01
by Raymond Toy 19 Feb '12

19 Feb '12

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 8895c013f61f55b8e561e0efa56962038b578213 (commit) from 14c63c68c74e9d0ebe1a21bcb23bad48a4a917a1 (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 8895c013f61f55b8e561e0efa56962038b578213 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sun Feb 19 15:49:10 2012 -0800 Add -R flag to force recompilation of C runtime. diff --git a/bin/build.sh b/bin/build.sh index 276272d..0ac13c8 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -94,6 +94,8 @@ usage () echo " translations instead of computing and displaying the diffs." echo " -O opt Any additional command-line flags to use when building." echo " The flags always include -noinit -nositeinit" + echo " -R Force recompiling the C runtime. Normally, just runs make to " + echo " recompile anything that has changed." exit 1 } @@ -124,11 +126,16 @@ buildit () then $TOOLDIR/clean-target.sh $CLEAN_FLAGS $TARGET || { echo "Failed: $TOOLDIR/clean-target.sh"; exit 1; } time $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } - # Set the LANG to C. For whatever reason, if I (rtoy) don't - # do this on my openSuSE system, any messages from gcc are - # basically garbled. This should be harmless on other - # systems. - LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } + if [ "$REBUILD_LISP" = "yes" ]; then + $TOOLDIR/rebuild-lisp.sh $TARGET + else + # Set the LANG to C. For whatever reason, if I (rtoy) don't + # do this on my openSuSE system, any messages from gcc are + # basically garbled. This should be harmless on other + # systems. + LANG=C $MAKE -C $TARGET/lisp $MAKE_TARGET || { echo "Failed: $MAKE -C $TARGET/lisp"; exit 1; } + fi + if [ "$BUILD_WORLD2" = "yes" ]; then $BUILDWORLD $TARGET $OLDLISP $BOOT || { echo "Failed: $BUILDWORLD"; exit 1; } @@ -145,7 +152,7 @@ BUILDWORLD="$TOOLDIR/build-world.sh" BUILD_POT="yes" UPDATE_TRANS= -while getopts "123Po:b:v:uB:C:Ui:f:w:O:?" arg +while getopts "123PRo:b:v:uB:C:Ui:f:w:O:?" arg do case $arg in 1) ENABLE2="no" ;; @@ -164,6 +171,7 @@ do w) BUILDWORLD="$OPTARG" ;; U) UPDATE_TRANS="yes";; O) OLDLISPFLAGS="$OLDLISPFLAGS $OPTARG" ;; + R) REBUILD_LISP="yes";; \?) usage ;; esac ----------------------------------------------------------------------- Summary of changes: bin/build.sh | 20 ++++++++++++++------ 1 files changed, 14 insertions(+), 6 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-02-16-g14c63c6
by Raymond Toy 17 Feb '12

17 Feb '12

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 14c63c68c74e9d0ebe1a21bcb23bad48a4a917a1 (commit) via f6c4baf6d5ec399d0fa556782ae01493911a37f7 (commit) via 2adbebc42e0732e50e7c3dfb997c252553c73a9a (commit) from 2e958dba7d37b76966146b2b279db7f0a248865d (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 14c63c68c74e9d0ebe1a21bcb23bad48a4a917a1 Merge: f6c4baf 2e958db Author: Raymond Toy <rtoy(a)google.com> Date: Fri Feb 17 11:38:21 2012 -0800 Merge branch 'master' of ssh://common-lisp.net/var/git/projects/cmucl/cmucl commit f6c4baf6d5ec399d0fa556782ae01493911a37f7 Author: Raymond Toy <rtoy(a)google.com> Date: Fri Feb 17 10:44:59 2012 -0800 Fix compiler warning. diff --git a/src/lisp/Linux-os.c b/src/lisp/Linux-os.c index 6c8f10f..8f85101 100644 --- a/src/lisp/Linux-os.c +++ b/src/lisp/Linux-os.c @@ -145,7 +145,7 @@ os_init0(const char *argv[], const char *envp[]) struct utsname name; uname(&name); - check_personality(&name, argv, envp); + check_personality(&name, (char *const *) argv, (char *const *) envp); } void commit 2adbebc42e0732e50e7c3dfb997c252553c73a9a Author: Raymond Toy <rtoy(a)google.com> Date: Fri Feb 17 10:44:45 2012 -0800 Remove unused var. diff --git a/src/lisp/interr.c b/src/lisp/interr.c index ecdcbc0..57e18f2 100644 --- a/src/lisp/interr.c +++ b/src/lisp/interr.c @@ -174,7 +174,6 @@ debug_print(lispobj object) if ((unsigned long) lisp_string->header == type_SimpleString) { unsigned short int* lisp_chars; int len; - int k; len = lisp_string->length >> 2; lisp_chars = (unsigned short int*) lisp_string->data; ----------------------------------------------------------------------- Summary of changes: src/lisp/Linux-os.c | 2 +- src/lisp/interr.c | 1 - 2 files changed, 1 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-02-13-g2e958db
by Raymond Toy 17 Feb '12

17 Feb '12

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 2e958dba7d37b76966146b2b279db7f0a248865d (commit) from c623db61db3f9538b79582a1331d86f22d03e7ac (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 2e958dba7d37b76966146b2b279db7f0a248865d Author: Raymond Toy <rtoy(a)google.com> Date: Thu Feb 16 20:41:32 2012 -0800 Fix compiler warning and use fwrite instead of putw to print a string. diff --git a/src/lisp/print.c b/src/lisp/print.c index 9f8fa10..f8a9086 100644 --- a/src/lisp/print.c +++ b/src/lisp/print.c @@ -372,11 +372,11 @@ print_string(struct vector* vector) int len = fixnum_value(vector->length); while (len-- > 0) { - if ((*charptr == '"')) { + if (*charptr == '"') { putchar('\\'); } /* Just dump out the UTF-16 data */ - putw(*charptr, stdout); + fwrite(charptr, sizeof(*charptr), 1, stdout); charptr++; } #endif ----------------------------------------------------------------------- Summary of changes: src/lisp/print.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-02-12-gc623db6
by Raymond Toy 12 Feb '12

12 Feb '12

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 c623db61db3f9538b79582a1331d86f22d03e7ac (commit) from d9a51ad03487c82a9d5998c1b2b4490447141b76 (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 c623db61db3f9538b79582a1331d86f22d03e7ac Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Feb 11 18:16:23 2012 -0800 Add the fpu type to kernel.core on x86. Needed to set the fpu_mode when it's loaded so that the C code knows what to do. In particular call_into_lisp needs to know to save the correct fpu state. diff --git a/src/compiler/generic/new-genesis.lisp b/src/compiler/generic/new-genesis.lisp index d356c36..ee417f4 100644 --- a/src/compiler/generic/new-genesis.lisp +++ b/src/compiler/generic/new-genesis.lisp @@ -2925,9 +2925,22 @@ ;; Write the Version entry. ;; (write-long version-entry-type-code) - (write-long 3) - (write-long version) + ;; For x86, identify the core as using either x87 or sse2 + ;; instructions. + (cond ((and (eql (c:backend-fasl-file-implementation c:*backend*) + c:x86-fasl-file-implementation) + (c:backend-featurep :sse2)) + (write-long 4) + (write-long version) + ;; See the definition of fpu_mode_t in lisp.h for correct + ;; values to use here. + (write-long (if (c:backend-featurep :sse2) + 2 ; fpu_mode_t = SSE2 + 1))) + (t + (write-long 3) + (write-long version))) ;; Write the New Directory entry header. ;; (write-long new-directory-entry-type-code) ----------------------------------------------------------------------- Summary of changes: src/compiler/generic/new-genesis.lisp | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-02-11-gd9a51ad
by Raymond Toy 11 Feb '12

11 Feb '12

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 d9a51ad03487c82a9d5998c1b2b4490447141b76 (commit) from 2997c7c834786873ea24e70ce9e45dc80f0ae8f8 (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 d9a51ad03487c82a9d5998c1b2b4490447141b76 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Feb 11 09:40:23 2012 -0800 Update documentation for string-to-octets. diff --git a/src/docs/cmu-user/unicode.tex b/src/docs/cmu-user/unicode.tex index 916c9dc..921a40d 100644 --- a/src/docs/cmu-user/unicode.tex +++ b/src/docs/cmu-user/unicode.tex @@ -560,15 +560,31 @@ utility functions are provided to make access easier. \end{defun} \begin{defun}{}{string-to-octets}{\args \var{string} \keys{\kwd{start} - \kwd{end} \kwd{external-format} \kwd{buffer}}} + \kwd{end} \kwd{external-format} \kwd{buffer} \kwd{buffer-start} + \kwd{error}}} \code{string-to-octets} converts \var{string} to a sequence of octets according to the external format specified by \var{external-format}. The string to be converted is bounded by \var{start}, which defaults to 0, and \var{end}, which defaults to the length of the string. If \var{buffer} is specified, the octets are placed in \var{buffer}. If \var{buffer} is not specified, a new - array is allocated to hold the octets. In all cases the buffer is - returned. + array is allocated to hold the octets. \var{buffer-start} specifies + where in the buffer the first octet will be placed. + + An error method may also be specified by \var{error}. Any errors + encountered while converting the string to octets will be handled + according to error. If \nil{}, a replacement character is converted + to octets in place of the error. Otherwise, \var{error} should be a + symbol or function that will be called when the error occurs. The + function takes two arguments: an error string and the character + that caused the error. It should return a replacement character. + + Three values are returned: The buffer, the number of valid octets + written, and the number of characters converted. Note that the + actual number of octets written may be greater than the returned + value, These represent the partial octets of the next character to + be converted, but there was not enough room to hold the complete set + of octets. \end{defun} \begin{defun}{}{octets-to-string}{\args \var{octets} \keys{\kwd{start} ----------------------------------------------------------------------- Summary of changes: src/docs/cmu-user/unicode.tex | 22 +++++++++++++++++++--- 1 files changed, 19 insertions(+), 3 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-02-10-g2997c7c
by Raymond Toy 11 Feb '12

11 Feb '12

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 2997c7c834786873ea24e70ce9e45dc80f0ae8f8 (commit) from 3c01fb6b269b50be99225257db1244346334b938 (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 2997c7c834786873ea24e70ce9e45dc80f0ae8f8 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Fri Feb 10 22:45:33 2012 -0800 Use fwrite to dump the string instead of putw. diff --git a/src/lisp/interr.c b/src/lisp/interr.c index 9b1f2e7..ecdcbc0 100644 --- a/src/lisp/interr.c +++ b/src/lisp/interr.c @@ -178,16 +178,14 @@ debug_print(lispobj object) len = lisp_string->length >> 2; lisp_chars = (unsigned short int*) lisp_string->data; - - for (k = 0; k < len; ++k) { - /* - * Do we really want to dump out 4 bytes? Should we - * just print out the low 8 bits of each Lisp - * character? - */ - putw(*lisp_chars, stdout); - ++lisp_chars; - } + + /* + * Do we really want to dump out the entire contents of + * the utf-16 string? Should we just print out the low 8 + * bits of each Lisp character? Or maybe convert the + * utf-16 string to some more suitable encoding? + */ + fwrite(lisp_chars, sizeof(*lisp_chars), len, stdout); putchar('\n'); fflush(stdout); ----------------------------------------------------------------------- Summary of changes: src/lisp/interr.c | 18 ++++++++---------- 1 files changed, 8 insertions(+), 10 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-02-9-g3c01fb6
by Raymond Toy 08 Feb '12

08 Feb '12

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 3c01fb6b269b50be99225257db1244346334b938 (commit) from 393bee0d7c4b52a32ea996d48004e4ce6f1299b8 (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 3c01fb6b269b50be99225257db1244346334b938 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Tue Feb 7 18:48:56 2012 -0800 Oops. Remove the set -x/set +x lines from the last commit. diff --git a/bin/build.sh b/bin/build.sh index 5eb2a5b..276272d 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -108,7 +108,6 @@ esac buildit () { - set -x if echo $INTERACTIVE_BUILD | grep $BUILD > /dev/null; then INTERACTIVE=t else @@ -139,7 +138,6 @@ buildit () $TARGET/lisp/lisp -batch -noinit -nositeinit $FPU_MODE < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; } return 0; fi - set +x } FPU_MODE= ----------------------------------------------------------------------- Summary of changes: bin/build.sh | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-02-8-g393bee0
by Raymond Toy 07 Feb '12

07 Feb '12

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 393bee0d7c4b52a32ea996d48004e4ce6f1299b8 (commit) via 8e025dcdc1d258fa9e2c08edb7f30a25a8de7081 (commit) from 701bc7eb5d81314343210d72a0b120ec3dfa0b86 (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 393bee0d7c4b52a32ea996d48004e4ce6f1299b8 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Feb 6 22:48:12 2012 -0800 No default version anymore; let load-world.sh specify it. diff --git a/bin/build.sh b/bin/build.sh index 85d70e7..5eb2a5b 100755 --- a/bin/build.sh +++ b/bin/build.sh @@ -43,10 +43,6 @@ version=20c SRCDIR=src BINDIR=bin TOOLDIR=$BINDIR -VERSION="`date '+%Y-%m-%d %H:%M:%S'`" -GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" -# Add the tree hash to the version -VERSION="$VERSION $GIT_HASH" OLDLISPFLAGS="-noinit -nositeinit" OLDLISP="cmulisp" @@ -112,6 +108,7 @@ esac buildit () { + set -x if echo $INTERACTIVE_BUILD | grep $BUILD > /dev/null; then INTERACTIVE=t else @@ -142,6 +139,7 @@ buildit () $TARGET/lisp/lisp -batch -noinit -nositeinit $FPU_MODE < /dev/null || { echo "Failed: $TARGET/lisp/lisp -batch -noinit $FPU_MODE"; exit 1; } return 0; fi + set +x } FPU_MODE= commit 8e025dcdc1d258fa9e2c08edb7f30a25a8de7081 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Mon Feb 6 22:47:49 2012 -0800 If git describe looks like a snapshot tag, just use that as the default version instead of adding the date to it. The tag has most of the desired information already, and this helps to keep lisp-implementation-version from having duplicate information. diff --git a/bin/load-world.sh b/bin/load-world.sh index 288e40c..b2fcb2e 100755 --- a/bin/load-world.sh +++ b/bin/load-world.sh @@ -13,7 +13,13 @@ SKIP_PCL= NO_PCL_FEATURE= # Default version is the date with the git hash. GIT_HASH="`(cd src; git describe --dirty 2>/dev/null)`" -VERSION="`date '+%Y-%m-%d %H:%M:%S'`${GIT_HASH:+ $GIT_HASH}" + +# If the git hash looks like a snapshot tag, don't add the date. +if expr "X${GIT_HASH}" : '^Xsnapshot-[0-9][0-9][0-9][0-9]-[01][0-9]' > /dev/null; then + VERSION="${GIT_HASH}" +else + VERSION="`date '+%Y-%m-%d %H:%M:%S'`${GIT_HASH:+ $GIT_HASH}" +fi echo $VERSION while getopts "p" arg @@ -40,7 +46,7 @@ if [ -n "$SKIP_PCL" ]; then NO_PCL_FEATURE="(pushnew :no-pcl *features*)" fi -# If version string give, use it, otherwise use the default. +# If version string given, use it, otherwise use the default. if [ -n "$2" ]; then VERSION="$2" fi ----------------------------------------------------------------------- Summary of changes: bin/build.sh | 6 ++---- bin/load-world.sh | 10 ++++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0

[cmucl-cvs] [git] CMU Common Lisp branch master updated. snapshot-2012-02-6-g701bc7e
by Raymond Toy 05 Feb '12

05 Feb '12

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 701bc7eb5d81314343210d72a0b120ec3dfa0b86 (commit) via a33856c25fb84f6890e72d5b4971ae5185074a38 (commit) via 32990e5e886fa740b41f8bc8b31d7e8321e8e44b (commit) via 0491bf46649fb1d58fb1a0c499748e2440bcd318 (commit) via 0f6c455c0e2697e1bdfc62f7def2f3c934b8841b (commit) from 537cc9bbd13399017524bd68935e0eb3a383a0f2 (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 701bc7eb5d81314343210d72a0b120ec3dfa0b86 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Feb 4 23:31:49 2012 -0800 Preliminary support for ppc and correct some comments. diff --git a/src/tools/linker.sh b/src/tools/linker.sh index 458b118..f97dcf4 100755 --- a/src/tools/linker.sh +++ b/src/tools/linker.sh @@ -8,8 +8,8 @@ # This script takes parameters specified by the running lisp to create # an executable image. # -# Despite the name, it is used for Linux/x86, Darwin/x86, and -# Solaris/sparc, as specified in src/lisp/elf.h. +# This is used for Linux/x86, Darwin/x86, and Solaris/sparc, as +# specified in src/lisp/elf.h. OPSYS=`uname` @@ -87,11 +87,20 @@ case $uname_s in # Specify how to link the entire lisp.a library OPT_ARCHIVE="-all_load $CMUCLLIB/lisp.a" - # Extra stuff. For some reason one __LINKEDIT segment is mapped - # just past the dynamic space. This messes things up, so we move it - # to another address. This seems to be free, at least on 10.5. + case `uname -p` in + i386) + # Extra stuff. For some reason one __LINKEDIT segment is + # mapped just past the dynamic space. This messes things + # up, so we move it to another address. This seems to be + # free, at least on 10.5. + + OPT_EXTRA="-segaddr __LINKEDIT 0x99000000 -rdynamic" + ;; + powerpc) + # Nothing needed for ppc? + ;; + esac - OPT_EXTRA="-segaddr __LINKEDIT 0x99000000 -rdynamic" # See Config.x86_darwin OS_LIBS= ;; commit a33856c25fb84f6890e72d5b4971ae5185074a38 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Feb 4 23:29:54 2012 -0800 Cleanup comments diff --git a/src/lisp/exec-final.c b/src/lisp/exec-final.c index 31fb65b..a446964 100644 --- a/src/lisp/exec-final.c +++ b/src/lisp/exec-final.c @@ -7,9 +7,9 @@ /* * See lisp.c for documentation, but basically this is linked in for - * Solaris executables to indicate that the image is builtin. We must - * not define initial_function_addr here because the linker script - * will set the value appropriately. + * executables to indicate that the image is builtin. We must not + * define initial_function_addr here because the linker script will + * set the value appropriately. */ int builtin_image_flag = 1; commit 32990e5e886fa740b41f8bc8b31d7e8321e8e44b Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Feb 4 23:16:47 2012 -0800 Clean up comments about exec-final. diff --git a/src/lisp/GNUmakefile b/src/lisp/GNUmakefile index a2cc761..a3289eb 100644 --- a/src/lisp/GNUmakefile +++ b/src/lisp/GNUmakefile @@ -33,10 +33,10 @@ lisp: ${OBJS} version.o mv -f ,lisp lisp # Create a library out of all the object files so we can build an -# executable. However, for Solaris, we need to remove exec-init.o -# because the linker will define symbols with the correct addresses. -# Also, we need to add EXEC_FINAL on Solaris to define -# builtin_image_flag with the correct value. +# executable. However, we need to remove exec-init.o from the library +# and replace it with exec-final.o because exec-final.o sets the +# builtin_image_flag to 1 so that the runtime knows the runtime +# contains the core sections. lisp.a: version.o ${OBJS} ${EXEC_FINAL_OBJ} ar crs lisp.a ${OBJS} version.o ifneq (${EXEC_FINAL_OBJ},) commit 0491bf46649fb1d58fb1a0c499748e2440bcd318 Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Feb 4 22:53:33 2012 -0800 Build with mach-o.c and exec-final.c if FEATURE_EXECUTABLE is defined. diff --git a/src/lisp/Config.ppc_darwin b/src/lisp/Config.ppc_darwin index da9737a..8ce16f4 100644 --- a/src/lisp/Config.ppc_darwin +++ b/src/lisp/Config.ppc_darwin @@ -42,6 +42,12 @@ 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 e_rem_pio2.c k_rem_pio2.c + +ifdef FEATURE_EXECUTABLE +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 commit 0f6c455c0e2697e1bdfc62f7def2f3c934b8841b Author: Raymond Toy <toy.raymond(a)gmail.com> Date: Sat Feb 4 22:52:27 2012 -0800 Support the creation of mach-o object files for ppc. diff --git a/src/lisp/mach-o.c b/src/lisp/mach-o.c index 66ea55e..441358e 100644 --- a/src/lisp/mach-o.c +++ b/src/lisp/mach-o.c @@ -130,7 +130,10 @@ write_mach_o_header(int fd) /* Ident array. */ eh.magic = MH_MAGIC; - /* Currently only support x86's */ +#if defined(__ppc__) + eh.cputype = CPU_TYPE_POWERPC; + eh.cpusubtype = CPU_SUBTYPE_POWERPC_ALL; +#else eh.cputype = CPU_TYPE_I386; /* * Support any kind x86. Should we be more specific? We need at @@ -139,6 +142,7 @@ write_mach_o_header(int fd) * Pentium 4? */ eh.cpusubtype = CPU_SUBTYPE_I386_ALL; +#endif eh.filetype = MH_OBJECT; ----------------------------------------------------------------------- Summary of changes: src/lisp/Config.ppc_darwin | 6 ++++++ src/lisp/GNUmakefile | 8 ++++---- src/lisp/exec-final.c | 6 +++--- src/lisp/mach-o.c | 6 +++++- src/tools/linker.sh | 21 +++++++++++++++------ 5 files changed, 33 insertions(+), 14 deletions(-) hooks/post-receive -- CMU Common Lisp

1 0