diff --git a/code/amd64-vm.lisp b/code/amd64-vm.lisp index 821db671b88bbcbf8ab2c4284e9f0f8a864cf526..86a42b7bf0383efc9596b143c7105f4c8b7b5905 100644 --- a/code/amd64-vm.lisp +++ b/code/amd64-vm.lisp @@ -7,7 +7,7 @@ ;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/amd64-vm.lisp,v 1.3 2009/06/11 16:03:57 rtoy Rel $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/amd64-vm.lisp,v 1.4 2009/10/10 03:00:03 agoncharov Exp $") ;;; ;;; ********************************************************************** ;;; @@ -55,30 +55,7 @@ (fpreg (array (struct fpreg) 8)) (status unsigned-long))) -;;; for FreeBSD -#+(and freebsd (not freebsd4)) -(def-alien-type sigcontext - (struct nil - (sc-onstack unsigned-int) - (sc-mask unsigned-int) - (sc-sp unsigned-int) - (sc-fp unsigned-int) - (sc-isp unsigned-int) - (sc-pc unsigned-int) - (sc-efl unsigned-int) ; sc_ps - (sc-es unsigned-int) - (sc-ds unsigned-int) - (sc-cs unsigned-int) - (sc-ss unsigned-int) - (sc-edi unsigned-int) - (sc-esi unsigned-int) - (sc-ebx unsigned-int) - (sc-edx unsigned-int) - (sc-ecx unsigned-int) - (sc-eax unsigned-int))) - -;;; FreeBSD 4.0 has a sigcontext that looks more like Linux. -#+freebsd4 +#+freebsd (def-alien-type sigcontext (struct nil (sc-mask (array unsigned-int 4)) diff --git a/code/bsd-os.lisp b/code/bsd-os.lisp index 740ff5501062c3143b1c370201b5bf6681b3737f..cdc55fb6fb81b59f5bdbacc19062a4088c524575 100644 --- a/code/bsd-os.lisp +++ b/code/bsd-os.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bsd-os.lisp,v 1.12 2009/06/11 16:03:57 rtoy Rel $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/bsd-os.lisp,v 1.13 2009/10/10 03:00:03 agoncharov Exp $") ;;; ;;; ********************************************************************** ;;; @@ -27,12 +27,10 @@ (register-lisp-feature #+OpenBSD :OpenBSD #+NetBSD :NetBSD - #+FreeBSD :FreeBSD + #+freebsd :freebsd #+Darwin :Darwin - #-(or FreeBSD NetBSD OpenBSD Darwin) :bsd) + #-(or freebsd NetBSD OpenBSD Darwin) :bsd) -#+freebsd4 -(register-lisp-feature :freebsd4) #+elf (register-lisp-feature :elf) #+mach-o @@ -43,9 +41,9 @@ (setq *software-type* #+OpenBSD "OpenBSD" #+NetBSD "NetBSD" - #+FreeBSD "FreeBSD" + #+freebsd "FreeBSD" #+Darwin "Darwin" - #-(or FreeBSD NetBSD OpenBSD Darwin) "BSD") + #-(or freebsd NetBSD OpenBSD Darwin) "BSD") (defvar *software-version* nil "Version string for supporting software") diff --git a/code/debug-int.lisp b/code/debug-int.lisp index 23f3f42b62702772d28c8a5a2ea1c37de9510439..fd9e7b801c3d907ef534e83a713852efd6e81833 100644 --- a/code/debug-int.lisp +++ b/code/debug-int.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.136 2009/06/11 16:03:57 rtoy Rel $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/debug-int.lisp,v 1.137 2009/10/10 03:00:03 agoncharov Exp $") ;;; ;;; ********************************************************************** ;;; @@ -954,11 +954,11 @@ (when (zerop depth) (format t "Debug: Both still valid ~s ~s ~s ~s~%" lisp-ocfp lisp-ra c-ocfp c-ra)) - #+(or darwin FreeBSD4) + #+(or darwin freebsd) (if (sap> lisp-ocfp c-ocfp) (values lisp-ra lisp-ocfp) (values c-ra c-ocfp)) - #-(or darwin FreeBSD4) + #-(or darwin freebsd) (values lisp-ra lisp-ocfp)) (lisp-path-fp ;; The lisp convention is looking good. diff --git a/code/foreign.lisp b/code/foreign.lisp index 702e49b9c38dab7c466ed6d0865dedfd1cd3e14f..1bea2d48dd572c608d38571c5cd72fae5a19bf16 100644 --- a/code/foreign.lisp +++ b/code/foreign.lisp @@ -5,7 +5,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/foreign.lisp,v 1.56 2009/06/11 16:03:57 rtoy Rel $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/foreign.lisp,v 1.57 2009/10/10 03:00:03 agoncharov Exp $") ;;; ;;; ********************************************************************** ;;; @@ -873,13 +873,13 @@ environment passed to Lisp." (let ((proc (ext:run-program *dso-linker* (list* - #+(or solaris linux FreeBSD4) "-G" - #+(or OpenBSD NetBSD irix) "-shared" + #+(or solaris linux) "-G" + #+(or freebsd OpenBSD NetBSD irix) "-shared" #+darwin "-dylib" "-o" output-file ;; Cause all specified libs to be loaded in full - #+(or OpenBSD linux FreeBSD4 NetBSD) "--whole-archive" + #+(or freebsd OpenBSD linux NetBSD) "--whole-archive" #+solaris "-z" #+solaris "allextract" #+darwin "-all_load" (append (mapcar @@ -896,7 +896,7 @@ environment passed to Lisp." files)) ;; Return to default ld behaviour for libs (list - #+(or OpenBSD linux FreeBSD4 NetBSD) + #+(or freebsd OpenBSD linux NetBSD) "--no-whole-archive" #+solaris "-z" #+solaris "defaultextract") libraries)) diff --git a/compiler/generic/new-genesis.lisp b/compiler/generic/new-genesis.lisp index 5ba6175d7004432a2fd02793bc184b7dee92c97d..35a2aad3f0afdf8d28adebf663c7b6c935eddc92 100644 --- a/compiler/generic/new-genesis.lisp +++ b/compiler/generic/new-genesis.lisp @@ -4,7 +4,7 @@ ;;; Carnegie Mellon University, and has been placed in the public domain. ;;; (ext:file-comment - "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/new-genesis.lisp,v 1.87 2009/06/15 16:56:08 rtoy Rel $") + "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/compiler/generic/new-genesis.lisp,v 1.88 2009/10/10 03:00:04 agoncharov Exp $") ;;; ;;; ********************************************************************** ;;; @@ -2116,12 +2116,12 @@ (eq (c:backend-fasl-file-implementation c:*backend*) #.c:alpha-fasl-file-implementation)) (c:backend-featurep :linux))) - (freebsd4-p (and (eq (c:backend-fasl-file-implementation c:*backend*) + (freebsd-p (and (eq (c:backend-fasl-file-implementation c:*backend*) #.c:x86-fasl-file-implementation) - (c:backend-featurep :freebsd4)))) + (c:backend-featurep :freebsd)))) (cond ((and #+linkage-table nil - (or linux-p freebsd4-p) + (or linux-p freebsd-p) (lookup-sym (concatenate 'string "PVE_stub_" name)))) ((and #+linkage-table nil (c:backend-featurep :darwin) diff --git a/tools/setenv-scripts/freebsd-features.lisp b/tools/setenv-scripts/freebsd-features.lisp index 6b35514ddeeef88be8d2f521b8d4f00ed11a9930..1ec8607dde18d73fcdbd0299aec0178c1f6aa4d0 100644 --- a/tools/setenv-scripts/freebsd-features.lisp +++ b/tools/setenv-scripts/freebsd-features.lisp @@ -1,9 +1,5 @@ ;; e.g. for FreeBSD on x86 you probably want: -;;(pushnew :freebsd4 *features*) ;;(pushnew :freebsd *features*) ;;(pushnew :elf *features*) -;; We can't really do this before adding #+freebsd5 reader -;; conditionals to the source code at appropiate places -;; (setf *features* (remove :freebsd4 *features*)) -;; (pushnew :freebsd5 *features*) +(setf *features* (remove :freebsd4 *features*))