[Sbcl-commits] CVS: sbcl/tools-for-build grovel-headers.c, 1.35, 1.36 ldso-stubs.lisp, 1.21, 1.22

[Nikodemus S. <de...@us...>]

Update of /cvsroot/sbcl/sbcl/tools-for-build
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv29556/tools-for-build

Modified Files:
	grovel-headers.c ldso-stubs.lisp 
Log Message:
1.0.24.12: adding and fixing the HPUX/HPPA build target

 * Patch by Larry Valkama.


Index: grovel-headers.c
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tools-for-build/grovel-headers.c,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- grovel-headers.c	14 Nov 2008 14:07:46 -0000	1.35
+++ grovel-headers.c	3 Jan 2009 15:50:46 -0000	1.36
@@ -47,6 +47,10 @@
 
 #include "genesis/config.h"
 
+#ifdef LISP_FEATURE_HPUX
+#include <sys/bsdtty.h> /* for TIOCGPGRP */
+#endif
+
 #include "wrap.h"
 
 #define DEFTYPE(lispname,cname) { cname foo; \
@@ -323,11 +327,10 @@
     printf("\n");
 
     printf(";;; various ioctl(2) flags\n");
-    defconstant("tiocnotty",  TIOCNOTTY);
-    defconstant("tiocgwinsz", TIOCGWINSZ);
-    defconstant("tiocswinsz", TIOCSWINSZ);
     defconstant("tiocgpgrp",  TIOCGPGRP);
     defconstant("tiocspgrp",  TIOCSPGRP);
+    defconstant("tiocgwinsz", TIOCGWINSZ);
+    defconstant("tiocswinsz", TIOCSWINSZ);
     /* KLUDGE: These are referenced by old CMUCL-derived code, but
      * Linux doesn't define them.
      *
@@ -399,7 +402,7 @@
     defsignal("sigwaiting", SIGWAITING);
 #endif
     defsignal("sigwinch", SIGWINCH);
-#ifndef SIGXCPU
+#ifdef SIGXCPU
     defsignal("sigxcpu", SIGXCPU);
 #endif
 #ifdef SIGXFSZ
@@ -428,7 +431,6 @@
 #else
     defconstant("fpe-fltsub", -1);
 #endif
-
 #endif // !WIN32
     return 0;
 }

Index: ldso-stubs.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/tools-for-build/ldso-stubs.lisp,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- ldso-stubs.lisp	9 Jan 2008 19:12:24 -0000	1.21
+++ ldso-stubs.lisp	3 Jan 2009 15:50:46 -0000	1.22
@@ -22,16 +22,16 @@
 ;;;; files for more information.
 
 #!-sparc
-(defun ldso-stubify (fct str)
-  (format str "LDSO_STUBIFY(~A)~%" fct))
+(defun ldso-stubify (fct stream)
+  (format stream "LDSO_STUBIFY(~A)~%" fct))
 
 ;;; This is an attempt to follow DB's hint of sbcl-devel
 ;;; 2001-09-18. -- CSR
 ;;;
 ;;; And an attempt to work around the Sun toolchain... --ns
 #!+sparc
-(defun ldso-stubify (fct str)
-  (apply #'format str "
+(defun ldso-stubify (fct stream)
+  (apply #'format stream "
 .globl ldso_stub__~A ;                          \\
         FUNCDEF(ldso_stub__~A) ;                \\
 ldso_stub__~A: ;                                \\
@@ -42,6 +42,18 @@
         .size    ldso_stub__~A,.L~Ae1-ldso_stub__~A ;~%"
           (make-list 9 :initial-element fct)))
 
+#!+hppa
+(defun ldso-stubify (fct stream)
+  (let ((stub (format nil "ldso_stub__~a" fct)))
+    (apply #'format stream (list
+"    .export ~A
+~A:
+    .proc
+    .callinfo
+    b,n ~a
+    .procend
+    .import ~a,code~%" stub stub fct fct))))
+
 (defvar *preludes* '("
 /* This is an automatically generated file, please do not hand-edit it.
  * See the program tools-for-build/ldso-stubs.lisp. */
@@ -85,6 +97,10 @@
 .L ## fct ## e1: ;                              \\
         .size    ldso_stub__ ## fct,.L ## fct ## e1-ldso_stub__ ## fct ;"
 
+#!+hppa "
+        .level  2.0
+        .text"
+
 #!+(and (not darwin) ppc) "
 #define LDSO_STUBIFY(fct)                       \\
 .globl ldso_stub__ ## fct ;                     \\
@@ -271,7 +287,7 @@
                    "tcsetattr"
                    "truncate"
                    "ttyname"
-                   "tzname"
+                   #!-hpux "tzname"
                    "unlink"
                    "utimes"
                    "wait3"