From 56caa7055d1a1d228842cf4fb05dc4b53f9131b0 Mon Sep 17 00:00:00 2001
From: Christophe Rhodes <csr21@cam.ac.uk>
Date: Fri, 28 Feb 2003 19:26:17 +0000
Subject: [PATCH] 0.7.13.9: 	Fix the sparc build 	... add some headers
 to some runtime files 	... give COLLECT-GARBAGE its
 argument in lispland, too 	Delete
 src/runtime/primitive-objects.h, as it's made by 
 genesis now

---
 src/code/gc.lisp                |    2 +-
 src/runtime/.cvsignore          |    1 +
 src/runtime/cheneygc.c          |    2 ++
 src/runtime/primitive-objects.h |   31 -------------------------------
 src/runtime/sparc-assem.S       |    5 ++++-
 version.lisp-expr               |    2 +-
 6 files changed, 9 insertions(+), 34 deletions(-)
 delete mode 100644 src/runtime/primitive-objects.h

diff --git a/src/code/gc.lisp b/src/code/gc.lisp
index 6459038..086d683 100644
--- a/src/code/gc.lisp
+++ b/src/code/gc.lisp
@@ -273,7 +273,7 @@ function should notify the user that the system has finished GC'ing.")
 ;;;; internal GC
 
 (sb!alien:define-alien-routine collect-garbage sb!alien:int
-  #!+gencgc (last-gen sb!alien:int))
+  (#!+gencgc last-gen #!-gencgc ignore sb!alien:int))
 
 (sb!alien:define-alien-routine set-auto-gc-trigger sb!alien:void
   (dynamic-usage sb!alien:unsigned-long))
diff --git a/src/runtime/.cvsignore b/src/runtime/.cvsignore
index 0d803f2..38a8e12 100644
--- a/src/runtime/.cvsignore
+++ b/src/runtime/.cvsignore
@@ -1,4 +1,5 @@
 depend
+genesis
 sbcl
 sbcl.h
 sbcl.nm
diff --git a/src/runtime/cheneygc.c b/src/runtime/cheneygc.c
index f557521..b9fd6b2 100644
--- a/src/runtime/cheneygc.c
+++ b/src/runtime/cheneygc.c
@@ -27,6 +27,8 @@
 #include "validate.h"
 #include "lispregs.h"
 #include "interr.h"
+#include "genesis/static-symbols.h"
+#include "genesis/primitive-objects.h"
 
 /* So you need to debug? */
 #if 0
diff --git a/src/runtime/primitive-objects.h b/src/runtime/primitive-objects.h
deleted file mode 100644
index e23a156..0000000
--- a/src/runtime/primitive-objects.h
+++ /dev/null
@@ -1,31 +0,0 @@
-#ifndef SBCL_PRIMITIVE_OBJECTS_H
-#define SBCL_PRIMITIVE_OBJECTS_H 1
-#include "genesis/array.h"
-#include "genesis/bignum.h"
-#include "genesis/binding.h"
-#include "genesis/catch-block.h"
-#include "genesis/closure.h"
-#include "genesis/code.h"
-#include "genesis/complex-double-float.h"
-#include "genesis/complex-single-float.h"
-#include "genesis/complex.h"
-#include "genesis/config.h"
-#include "genesis/cons.h"
-#include "genesis/constants.h"
-#include "genesis/double-float.h"
-#include "genesis/fdefn.h"
-#include "genesis/funcallable-instance.h"
-#include "genesis/instance.h"
-#include "genesis/ratio.h"
-#include "genesis/return-pc.h"
-#include "genesis/sap.h"
-#include "genesis/simple-fun.h"
-#include "genesis/single-float.h"
-#include "genesis/static-symbols.h"
-#include "genesis/symbol.h"
-#include "gencgc-alloc-region.h"
-#include "genesis/unwind-block.h"
-#include "genesis/value-cell.h"
-#include "genesis/vector.h"
-#include "genesis/weak-pointer.h"
-#endif /* SBCL_PRIMITIVE_OBJECTS_H */
diff --git a/src/runtime/sparc-assem.S b/src/runtime/sparc-assem.S
index c766729..cb4bfe6 100644
--- a/src/runtime/sparc-assem.S
+++ b/src/runtime/sparc-assem.S
@@ -6,7 +6,10 @@
 #include "lispregs.h"
 #include "globals.h"
 #include "sbcl.h"
-
+#include "genesis/closure.h"
+#include "genesis/fdefn.h"
+#include "genesis/static-symbols.h"
+#include "genesis/simple-fun.h"	
 
 #define load(sym, reg) \
         sethi %hi(sym), reg; ld [reg+%lo(sym)], reg
diff --git a/version.lisp-expr b/version.lisp-expr
index a224dcc..a459a66 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -18,4 +18,4 @@
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
 
-"0.7.13.8"
+"0.7.13.9"
-- 
1.7.10.4