From eb5265ab22a2b1cae18bbdf43c871dba9b5927ea Mon Sep 17 00:00:00 2001 From: William Harold Newman Date: Fri, 10 Sep 2004 15:36:17 +0000 Subject: [PATCH] 0.8.14.9: fixes for build on my old Debian system... ...added missing #!+LINKAGE-TABLE ...converted "cd foo" to "cd ./foo" so that CDPATH-based logic won't helpfully announce the name of the new dir to stdout (and thus into local-target-features.lisp-expr); then "cd ./foo > /dev/null" for overkill generally grepped for and changed "cd foo" to "cd ./foo" to reduce the amount of CDPATH ambiguity involved and the amount of stdout noise generated --- base-target-features.lisp-expr | 8 ++++---- clean.sh | 6 +++--- make-config.sh | 4 ++-- make-target-1.sh | 6 +++--- src/compiler/generic/genesis.lisp | 4 +++- src/runtime/x86-arch.h | 4 ++-- tools-for-build/grovel-features.sh | 2 +- tools-for-build/sparc-funcdef.sh | 2 +- version.lisp-expr | 2 +- 9 files changed, 20 insertions(+), 18 deletions(-) diff --git a/base-target-features.lisp-expr b/base-target-features.lisp-expr index 0dad915..7b613dd 100644 --- a/base-target-features.lisp-expr +++ b/base-target-features.lisp-expr @@ -107,10 +107,10 @@ ;; readtable configured so that the system sources can be read. ; :sb-show - ;; Build SBCL with the old CMU CL low level debugger, "ldb". If - ;; are aren't messing with CMU CL at a very low level (e.g. - ;; trying to diagnose GC problems, or trying to debug assembly - ;; code for a port to a new CPU) you shouldn't need this. + ;; Build SBCL with the old CMU CL low level debugger, "ldb". If are + ;; aren't messing with SBCL at a very low level (e.g., trying to + ;; diagnose GC problems, or trying to debug assembly code for a port + ;; to a new CPU) you shouldn't need this. ; :sb-ldb ;; This isn't really a target Lisp feature at all, but controls diff --git a/clean.sh b/clean.sh index 50feec1..540f8f9 100755 --- a/clean.sh +++ b/clean.sh @@ -29,14 +29,14 @@ find_gnumake # Ask some other directories to clean themselves up. original_pwd=`pwd` for d in tools-for-build; do - cd $d > /dev/null + cd ./$d > /dev/null # I hope the -s option is standard. At least GNU make and BSD make # support it. It silences make, since otherwise the output from # this script is just the operations done by these make's, which # is misleading when this script does lotso other operations too. # -- WHN $GNUMAKE -I ../src/runtime -s clean - cd $original_pwd > /dev/null + cd $original_pwd > /dev/null done # Within all directories, remove things which don't look like source @@ -111,4 +111,4 @@ find . \( \ -name 'test-passed' -o \ -name 'local-target-features.lisp-expr' \) -print | xargs rm -f -cd doc && sh ./clean.sh +cd ./doc && sh ./clean.sh diff --git a/make-config.sh b/make-config.sh index c1d49be..f0dab4c 100644 --- a/make-config.sh +++ b/make-config.sh @@ -58,7 +58,7 @@ printf ":%s" "$sbcl_arch" >> $ltf for d in src/compiler src/assembly; do echo //setting up symlink $d/target original_dir=`pwd` - cd $d + cd ./$d if [ -h target ] ; then rm target elif [ -w target ] ; then @@ -85,7 +85,7 @@ ln -s ../assembly src/compiler/assembly echo //setting up OS-dependent information original_dir=`pwd` -cd src/runtime/ +cd ./src/runtime/ rm -f Config target-arch-os.h target-arch.h target-os.h target-lispregs.h # KLUDGE: these two logically belong in the previous section # ("architecture-dependent"); it seems silly to enforce this in terms diff --git a/make-target-1.sh b/make-target-1.sh index 8256384..a8d42a3 100644 --- a/make-target-1.sh +++ b/make-target-1.sh @@ -23,7 +23,7 @@ echo //entering make-target-1.sh # could come either before or after running the cross compiler; that # doesn't matter.) echo //building runtime system and symbol table file -cd src/runtime +cd ./src/runtime $GNUMAKE clean || exit 1 $GNUMAKE depend || exit 1 $GNUMAKE all || exit 1 @@ -31,13 +31,13 @@ cd ../.. # Use a little C program to grab stuff from the C header files and # smash it into Lisp source code. -cd tools-for-build +cd ./tools-for-build $GNUMAKE -I../src/runtime grovel-headers || exit 1 cd .. tools-for-build/grovel-headers > output/stuff-groveled-from-headers.lisp # after-grovel-headers may not exist for all platforms (used for # Darwin hacks) -cd src/runtime +cd ./src/runtime $GNUMAKE after-grovel-headers || true cd .. diff --git a/src/compiler/generic/genesis.lisp b/src/compiler/generic/genesis.lisp index 6f1140e..4b9ce54 100644 --- a/src/compiler/generic/genesis.lisp +++ b/src/compiler/generic/genesis.lisp @@ -156,7 +156,7 @@ bigvec) ;;;; looking up bytes and multi-byte values in a BIGVEC (considering -;;;; it as an image of machine memory) +;;;; it as an image of machine memory on the cross-compilation target) ;;; BVREF-32 and friends. These are like SAP-REF-n, except that ;;; instead of a SAP we use a BIGVEC. @@ -2489,6 +2489,7 @@ (do-cold-fixup code-object offset value kind)) code-object)) +#!+linkage-table (define-cold-fop (fop-foreign-dataref-fixup) (let* ((kind (pop-stack)) (code-object (pop-stack)) @@ -2566,6 +2567,7 @@ (format t "/*~%") (dolist (line '("This is a machine-generated file. Please do not edit it by hand." + "(As of sbcl-0.8.14, it came from WRITE-CONFIG-H in genesis.lisp.)" "" "This file contains low-level information about the" "internals of a particular version and configuration" diff --git a/src/runtime/x86-arch.h b/src/runtime/x86-arch.h index 3bd1e5c..c5498ff 100644 --- a/src/runtime/x86-arch.h +++ b/src/runtime/x86-arch.h @@ -5,11 +5,11 @@ #ifndef _X86_ARCH_H #define _X86_ARCH_H #ifndef SBCL_GENESIS_CONFIG -#error genesis/config.h (or sbcl.h) must be incuded before this file +#error genesis/config.h (or sbcl.h) must be included before this file #endif #ifndef SBCL_GENESIS_CONFIG -#error genesis/config.h (or sbcl.h) must be incuded before this file +#error genesis/config.h (or sbcl.h) must be included before this file #endif #define ARCH_HAS_STACK_POINTER diff --git a/tools-for-build/grovel-features.sh b/tools-for-build/grovel-features.sh index 2eac63c..935c099 100644 --- a/tools-for-build/grovel-features.sh +++ b/tools-for-build/grovel-features.sh @@ -1,5 +1,5 @@ # Automated platform feature testing -cd tools-for-build +cd ./tools-for-build > /dev/null # FIXME: Use this to test for dlopen presence and hence # load-shared-object buildability diff --git a/tools-for-build/sparc-funcdef.sh b/tools-for-build/sparc-funcdef.sh index 054ced5..406abac 100644 --- a/tools-for-build/sparc-funcdef.sh +++ b/tools-for-build/sparc-funcdef.sh @@ -1,4 +1,4 @@ -cd tools-for-build +cd ./tools-for-build TMP=sparc-funcdef.S diff --git a/version.lisp-expr b/version.lisp-expr index d25b43c..56c5052 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.14.8" +"0.8.14.9" -- 1.7.10.4