Separate builtin initialization calls

1 files changed, 13 insertions, 7 deletions

diff --git a/inits.c b/inits.c
index 72a2a9868b..b313d1dd10 100644
--- a/inits.c
+++ b/inits.c
@@ -12,6 +12,7 @@
 #include "internal/inits.h"
 #include "ruby.h"
 #include "builtin.h"
+static void Init_builtin_prelude(void);
 #include "prelude.rbinc"
 
 #define CALL(n) {void Init_##n(void); Init_##n();}
@@ -45,6 +46,7 @@ rb_call_inits(void)
     CALL(Hash);
     CALL(Struct);
     CALL(Regexp);
+    CALL(pack);
     CALL(transcode);
     CALL(marshal);
     CALL(Range);
@@ -57,6 +59,7 @@ rb_call_inits(void)
     CALL(Proc);
     CALL(Binding);
     CALL(Math);
+    CALL(GC);
     CALL(Enumerator);
     CALL(VM);
     CALL(ISeq);
@@ -66,18 +69,21 @@ rb_call_inits(void)
     CALL(Rational);
     CALL(Complex);
     CALL(version);
+    CALL(vm_trace);
     CALL(vm_stack_canary);
+    CALL(ast);
     CALL(gc_stress);
 
     // enable builtin loading
     CALL(builtin);
 
-    CALL(GC);
-    CALL(IO_nonblock);
-    CALL(ast);
-    CALL(vm_trace);
-    CALL(pack);
-    CALL(warning);
-    load_prelude();
+#define BUILTIN(n) CALL(builtin_##n)
+    BUILTIN(gc);
+    BUILTIN(io);
+    BUILTIN(ast);
+    BUILTIN(trace_point);
+    BUILTIN(pack);
+    BUILTIN(warning);
+    Init_builtin_prelude();
 }
 #undef CALL