Skip to content

Commit

Permalink
Separate miniruby from dmyext.c
Browse files Browse the repository at this point in the history
  • Loading branch information
nobu committed Feb 21, 2024
1 parent 04729fe commit 01c7e16
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 10 deletions.
4 changes: 2 additions & 2 deletions common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ NORMALMAINOBJ = main.$(OBJEXT)
MAINOBJ = $(NORMALMAINOBJ)
DLDOBJS = $(INITOBJS)
EXTSOLIBS =
MINIOBJS = $(ARCHMINIOBJS) miniinit.$(OBJEXT) dmyext.$(OBJEXT)
MINIOBJS = $(ARCHMINIOBJS) miniinit.$(OBJEXT)
ENC_MK = enc.mk
MAKE_ENC = -f $(ENC_MK) V="$(V)" UNICODE_HDR_DIR="$(UNICODE_HDR_DIR)" \
RUBY="$(BOOTSTRAPRUBY)" MINIRUBY="$(BOOTSTRAPRUBY)" $(mflags)
Expand Down Expand Up @@ -412,7 +412,7 @@ programs: $(PROGRAM) $(WPROGRAM) $(arch)-fake.rb

$(PREP): $(MKFILES)

miniruby$(EXEEXT): config.status $(ALLOBJS) $(ARCHFILE)
miniruby$(EXEEXT): config.status $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(ARCHFILE)

objs: $(ALLOBJS)

Expand Down
17 changes: 13 additions & 4 deletions dmyenc.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
// This file is used only by ruby.
// miniruby does not use this Init_enc. Instead, "miniinit.c" provides Init_enc, which defines only the builtin encodings.
// Dynamically-linked ruby uses this Init_enc, which requires "enc/encdb.so" to load the builtin encodings and set up the optional encodings.
// Statically-linked ruby does not use this Init_enc. Instead, "enc/encinit.c" (which is a generated file) defines Init_enc, which activates the encodings.
// This file is used by dynamically-linked ruby, which has no
// statically-linked encodings other than the builtin encodings.
//
// - miniruby does not use this Init_enc. Instead, "miniinit.c"
// provides Init_enc, which defines only the builtin encodings.
//
// - Dynamically-linked ruby uses this Init_enc, which requires
// "enc/encdb.so" to load the builtin encodings and set up the
// optional encodings.
//
// - Statically-linked ruby does not use this Init_enc. Instead,
// "enc/encinit.c" (which is a generated file) defines Init_enc,
// which activates the encodings.

#define require(name) ruby_require_internal(name, (unsigned int)sizeof(name)-1)
int ruby_require_internal(const char *, int);
Expand Down
17 changes: 13 additions & 4 deletions dmyext.c
Original file line number Diff line number Diff line change
@@ -1,7 +1,16 @@
// This file is used by dynamically-linked ruby and miniruby.
// miniruby uses this Init_ext, which does nothing. It does not support require'ing extension libraries.
// Dynamically-linked ruby uses this Init_ext, which does nothing. It loads extension libraries by dlopen, etc.
// Statically-linked ruby does not use this Init_ext. Instead, "ext/extinit.c" (which is a generated file) defines Init_ext, which activates the (statically-linked) extension libraries.
// This file is used by dynamically-linked ruby, which has no
// statically-linked extension libraries.
//
// - miniruby does not use this Init_ext. Instead, "miniinit.c"
// provides Init_enc, which does nothing too. It does not support
// require'ing extension libraries.
//
// - Dynamically-linked ruby uses this Init_ext, which does
// nothing. It loads extension libraries by dlopen, etc.
//
// - Statically-linked ruby does not use this Init_ext. Instead,
// "ext/extinit.c" (which is a generated file) defines Init_ext,
// which activates the (statically-linked) extension libraries.

void
Init_ext(void)
Expand Down
6 changes: 6 additions & 0 deletions miniinit.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,12 @@ Init_enc(void)
rb_encdb_alias("ASCII", "US-ASCII");
}

/* miniruby does not support dynamic loading. */
void
Init_ext(void)
{
}

#include "mini_builtin.c"

void
Expand Down

0 comments on commit 01c7e16

Please sign in to comment.