X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Fgc.lisp;h=086d6836aad392ce2c58b54f5e7115303c5f7f34;hb=2db3b6b4cb740d5b6512459c223859f747807b09;hp=776acdd8b37bb3f1e05930d3716384a6374d5fc4;hpb=148e3820ad314a9b59d0133c1d60eaac4af9118b;p=sbcl.git

diff --git a/src/code/gc.lisp b/src/code/gc.lisp
index 776acdd..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))
@@ -349,17 +349,7 @@ function should notify the user that the system has finished GC'ing.")
 		   ;; triggered GC could've done a fair amount of
 		   ;; consing.)
 		   (pre-internal-gc-dynamic-usage (dynamic-usage))
-		   (ignore-me
-		    #!-gencgc (funcall *internal-gc*)
-		    ;; FIXME: This EQ test is pretty gross. Among its other
-		    ;; nastinesses, it looks as though it could break if we
-		    ;; recompile COLLECT-GARBAGE. We should probably just
-		    ;; straighten out the interface so that all *INTERNAL-GC*
-		    ;; functions accept a GEN argument (and then the
-		    ;; non-generational ones just ignore it).
-		    #!+gencgc (if (eq *internal-gc* #'collect-garbage)
-				  (funcall *internal-gc* gen)
-				  (funcall *internal-gc*)))
+		   (ignore-me (funcall *internal-gc* gen))
 		   (post-gc-dynamic-usage (dynamic-usage))
 		   (n-bytes-freed (- pre-internal-gc-dynamic-usage
 				     post-gc-dynamic-usage))