Throw errors on malformed FUNCTION.

[sbcl.git] / src / code / sunos-os.lisp

diff --git a/src/code/sunos-os.lisp b/src/code/sunos-os.lisp
index 9aad8b6..ae4b233 100644 (file)
--- a/src/code/sunos-os.lisp
+++ b/src/code/sunos-os.lisp
@@ -1,4 +1,4 @@
-;;;; OS interface functions for CMU CL under Solaris (FIXME: SunOS?)
+;;;; OS interface functions for SBCL under SunOS
 
 ;;;; This software is part of the SBCL system. See the README file for
 ;;;; more information.
@@ -18,9 +18,7 @@
 (defun software-type ()
   #!+sb-doc
   "Return a string describing the supporting software."
-  (values "Solaris"))
-
-(defvar *software-version* nil)
+  (values "SunOS"))
 
 (defun software-version ()
   #!+sb-doc
@@ -28,23 +26,10 @@
   if not available."
   (or *software-version*
       (setf *software-version*
-           (string-trim '(#\newline)
-                        (with-output-to-string (stream)
-                          (sb!ext:run-program "/bin/uname" `("-r")
-                                              :output stream))))))
-
-(defun os-cold-init-or-reinit () ; KLUDGE: don't know what to do here
-  (/show "entering solaris-os.lisp OS-COLD-INIT-OR-REINIT")
-  (setf *software-version* nil)
-  (/show "setting *DEFAULT-PATHNAME-DEFAULTS*")
-  (setf *default-pathname-defaults*
-       ;; (temporary value, so that #'PATHNAME won't blow up when
-       ;; we call it below:)
-       (make-trivial-default-pathname)
-       *default-pathname-defaults*
-       ;; (final value, constructed using #'PATHNAME:)
-       (pathname (sb!unix:posix-getcwd/)))
-  (/show "leaving solaris-os.lisp OS-COLD-INIT-OR-REINIT"))
+            (string-trim '(#\newline)
+                         (with-output-to-string (stream)
+                           (sb!ext:run-program "/bin/uname" `("-r")
+                                               :output stream))))))
 
 ;;; Return system time, user time and number of page faults.
 (defun get-system-info ()
@@ -62,4 +47,9 @@
   ;; FIXME: Or we could just get rid of this, since the uses of it look
   ;; disposable.
   ;; FIXME II: this could well be wrong
-  8192)
+  #!+sparc 8192
+  #!+(or x86 x86-64) 4096)
+
+;;; support for CL:MACHINE-VERSION defined OAOO elsewhere
+(defun get-machine-version ()
+  nil)