X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fruntime.c;h=0307d055fc20a220daf39b74151b9a0d77e554e9;hb=2010727926b091b23a246f6f659be61e27e19667;hp=019b12fa9f992c40d5a4f323fc9ad82a94c7db04;hpb=c81c32ef8a737b0cc61d3c0c6a137cab39baac73;p=sbcl.git

diff --git a/src/runtime/runtime.c b/src/runtime/runtime.c
index 019b12f..0307d05 100644
--- a/src/runtime/runtime.c
+++ b/src/runtime/runtime.c
@@ -40,9 +40,6 @@
 #include "interr.h"
 #include "monitor.h"
 #include "validate.h"
-#if defined GENCGC
-#include "gencgc.h"
-#endif
 #include "core.h"
 #include "save.h"
 #include "lispregs.h"
@@ -151,10 +148,10 @@ main(int argc, char *argv[], char *envp[])
 		    lose("more than one core file specified");
 		} else {
 		    ++argi;
-		    core = copied_string(argv[argi]);
 		    if (argi >= argc) {
 			lose("missing filename for --core argument");
 		    }
+		    core = copied_string(argv[argi]);
 		    ++argi;
 		}
 	    } else if (0 == strcmp(arg, "--end-runtime-options")) {
@@ -254,11 +251,6 @@ More information about SBCL is available at <http://sbcl.sourceforge.net/>.\n\
 
     set_lossage_handler(monitor_or_something);
 
-#if 0
-    os_init();
-    gc_init();
-    validate();
-#endif
     globals_init();
 
     initial_function = load_core_file(core);
@@ -268,10 +260,7 @@ More information about SBCL is available at <http://sbcl.sourceforge.net/>.\n\
     SHOW("freeing core");
     free(core);
 
-#if defined GENCGC
-    gencgc_pickup_dynamic();
-#else
-#endif
+    gc_initialize_pointers();
 
 #ifdef BINDING_STACK_POINTER
     SetSymbolValue(BINDING_STACK_POINTER, BINDING_STACK_START);