Skip to content
Snippets Groups Projects
Commit 935b304f authored by agoncharov's avatar agoncharov
Browse files

Remove the "freebsd4" feature from the, well, FreeBSD product

parent 76505007
No related branches found
No related tags found
No related merge requests found
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
;;; Scott Fahlman or slisp-group@cs.cmu.edu. ;;; Scott Fahlman or slisp-group@cs.cmu.edu.
;;; ;;;
(ext:file-comment (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 @@ ...@@ -55,30 +55,7 @@
(fpreg (array (struct fpreg) 8)) (fpreg (array (struct fpreg) 8))
(status unsigned-long))) (status unsigned-long)))
;;; for FreeBSD #+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
(def-alien-type sigcontext (def-alien-type sigcontext
(struct nil (struct nil
(sc-mask (array unsigned-int 4)) (sc-mask (array unsigned-int 4))
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain. ;;; Carnegie Mellon University, and has been placed in the public domain.
;;; ;;;
(ext:file-comment (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 @@ ...@@ -27,12 +27,10 @@
(register-lisp-feature #+OpenBSD :OpenBSD (register-lisp-feature #+OpenBSD :OpenBSD
#+NetBSD :NetBSD #+NetBSD :NetBSD
#+FreeBSD :FreeBSD #+freebsd :freebsd
#+Darwin :Darwin #+Darwin :Darwin
#-(or FreeBSD NetBSD OpenBSD Darwin) :bsd) #-(or freebsd NetBSD OpenBSD Darwin) :bsd)
#+freebsd4
(register-lisp-feature :freebsd4)
#+elf #+elf
(register-lisp-feature :elf) (register-lisp-feature :elf)
#+mach-o #+mach-o
...@@ -43,9 +41,9 @@ ...@@ -43,9 +41,9 @@
(setq *software-type* #+OpenBSD "OpenBSD" (setq *software-type* #+OpenBSD "OpenBSD"
#+NetBSD "NetBSD" #+NetBSD "NetBSD"
#+FreeBSD "FreeBSD" #+freebsd "FreeBSD"
#+Darwin "Darwin" #+Darwin "Darwin"
#-(or FreeBSD NetBSD OpenBSD Darwin) "BSD") #-(or freebsd NetBSD OpenBSD Darwin) "BSD")
(defvar *software-version* nil "Version string for supporting software") (defvar *software-version* nil "Version string for supporting software")
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain. ;;; Carnegie Mellon University, and has been placed in the public domain.
;;; ;;;
(ext:file-comment (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 @@ ...@@ -954,11 +954,11 @@
(when (zerop depth) (when (zerop depth)
(format t "Debug: Both still valid ~s ~s ~s ~s~%" (format t "Debug: Both still valid ~s ~s ~s ~s~%"
lisp-ocfp lisp-ra c-ocfp c-ra)) lisp-ocfp lisp-ra c-ocfp c-ra))
#+(or darwin FreeBSD4) #+(or darwin freebsd)
(if (sap> lisp-ocfp c-ocfp) (if (sap> lisp-ocfp c-ocfp)
(values lisp-ra lisp-ocfp) (values lisp-ra lisp-ocfp)
(values c-ra c-ocfp)) (values c-ra c-ocfp))
#-(or darwin FreeBSD4) #-(or darwin freebsd)
(values lisp-ra lisp-ocfp)) (values lisp-ra lisp-ocfp))
(lisp-path-fp (lisp-path-fp
;; The lisp convention is looking good. ;; The lisp convention is looking good.
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain. ;;; Carnegie Mellon University, and has been placed in the public domain.
;;; ;;;
(ext:file-comment (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." ...@@ -873,13 +873,13 @@ environment passed to Lisp."
(let ((proc (ext:run-program (let ((proc (ext:run-program
*dso-linker* *dso-linker*
(list* (list*
#+(or solaris linux FreeBSD4) "-G" #+(or solaris linux) "-G"
#+(or OpenBSD NetBSD irix) "-shared" #+(or freebsd OpenBSD NetBSD irix) "-shared"
#+darwin "-dylib" #+darwin "-dylib"
"-o" "-o"
output-file output-file
;; Cause all specified libs to be loaded in full ;; 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" #+solaris "-z" #+solaris "allextract"
#+darwin "-all_load" #+darwin "-all_load"
(append (mapcar (append (mapcar
...@@ -896,7 +896,7 @@ environment passed to Lisp." ...@@ -896,7 +896,7 @@ environment passed to Lisp."
files)) files))
;; Return to default ld behaviour for libs ;; Return to default ld behaviour for libs
(list (list
#+(or OpenBSD linux FreeBSD4 NetBSD) #+(or freebsd OpenBSD linux NetBSD)
"--no-whole-archive" "--no-whole-archive"
#+solaris "-z" #+solaris "defaultextract") #+solaris "-z" #+solaris "defaultextract")
libraries)) libraries))
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
;;; Carnegie Mellon University, and has been placed in the public domain. ;;; Carnegie Mellon University, and has been placed in the public domain.
;;; ;;;
(ext:file-comment (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 @@ ...@@ -2116,12 +2116,12 @@
(eq (c:backend-fasl-file-implementation c:*backend*) (eq (c:backend-fasl-file-implementation c:*backend*)
#.c:alpha-fasl-file-implementation)) #.c:alpha-fasl-file-implementation))
(c:backend-featurep :linux))) (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:x86-fasl-file-implementation)
(c:backend-featurep :freebsd4)))) (c:backend-featurep :freebsd))))
(cond (cond
((and #+linkage-table nil ((and #+linkage-table nil
(or linux-p freebsd4-p) (or linux-p freebsd-p)
(lookup-sym (concatenate 'string "PVE_stub_" name)))) (lookup-sym (concatenate 'string "PVE_stub_" name))))
((and #+linkage-table nil ((and #+linkage-table nil
(c:backend-featurep :darwin) (c:backend-featurep :darwin)
......
;; e.g. for FreeBSD on x86 you probably want: ;; e.g. for FreeBSD on x86 you probably want:
;;(pushnew :freebsd4 *features*)
;;(pushnew :freebsd *features*) ;;(pushnew :freebsd *features*)
;;(pushnew :elf *features*) ;;(pushnew :elf *features*)
;; We can't really do this before adding #+freebsd5 reader (setf *features* (remove :freebsd4 *features*))
;; conditionals to the source code at appropiate places
;; (setf *features* (remove :freebsd4 *features*))
;; (pushnew :freebsd5 *features*)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment