summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-05 16:51:12 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-02-05 16:51:12 +0000
commit1fd0a7a6608ed0a0514d59e40f3a149f289ea537 (patch)
treeb76763feaf092ba71c265e2a39abe4f73bb5f467
parent68baf9551e5d7bb43d1a7cce8e80ecb5f06e8724 (diff)
mjit.c: determine prefix of MJIT header at runtime
so that MJIT can work if Ruby is distributed as prebuilt binary. Now mjit_init() depends on the internal const TMP_RUBY_PREFIX which is only available after ruby_init_loadpath_safe() (L1608) and before ruby_init_prelude() (L1681). So the place of mjit_init() is moved. Makefile.in: Removed static prefix from MJIT_HEADER_ISNTALL_DIR macro. And this removes the unused LIBRUBY_LIBDIR macro as well. win32/Makefile.sub: ditto. Patch by: Lars Kanis <lars@greiz-reinsdorf.de> [Bug #14445] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62238 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--Makefile.in2
-rw-r--r--mjit.c35
-rw-r--r--ruby.c8
-rw-r--r--win32/Makefile.sub2
4 files changed, 38 insertions, 9 deletions
diff --git a/Makefile.in b/Makefile.in
index 840e8043100..49b0eaef21a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,7 +69,7 @@ debugflags = @debugflags@
warnflags = @warnflags@ @strict_warnflags@
cppflags = @cppflags@
XCFLAGS = @XCFLAGS@
-CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) -DMJIT_HEADER_BUILD_DIR=\""$(EXTOUT)/include/$(arch)"\" -DLIBRUBYARG_SHARED=\""$(LIBRUBYARG_SHARED)"\" -DLIBRUBY_LIBDIR=\""$(prefix)/lib"\" -DMJIT_HEADER_INSTALL_DIR=\""$(prefix)/include/$(RUBY_BASE_NAME)-$(ruby_version)/$(arch)"\"
+CPPFLAGS = @CPPFLAGS@ $(INCFLAGS) -DMJIT_HEADER_BUILD_DIR=\""$(EXTOUT)/include/$(arch)"\" -DLIBRUBYARG_SHARED=\""$(LIBRUBYARG_SHARED)"\" -DMJIT_HEADER_INSTALL_DIR=\""include/$(RUBY_BASE_NAME)-$(ruby_version)/$(arch)"\"
MJIT_HEADER_FLAGS = @MJIT_HEADER_FLAGS@
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
EXTLDFLAGS = @EXTLDFLAGS@
diff --git a/mjit.c b/mjit.c
index af8d3fc0449..fb7fe14f061 100644
--- a/mjit.c
+++ b/mjit.c
@@ -202,6 +202,13 @@ static VALUE valid_class_serials;
/* Ruby level interface module. */
VALUE rb_mMJIT;
+#ifdef _WIN32
+/* Linker option to enable libruby in the build directory. */
+static char *libruby_build;
+/* Linker option to enable libruby in the directory after install. */
+static char *libruby_installed;
+#endif
+
/* Return time in milliseconds as a double. */
static double
real_ms_time(void)
@@ -629,10 +636,12 @@ compile_c_to_so(const char *c_file, const char *so_file)
int exit_code;
static const char *input[] = {NULL, NULL};
static const char *output[] = {"-o", NULL, NULL};
- static const char *libs[] = {
+ const char *libs[] = {
#ifdef _WIN32
+ /* Look for ruby.dll.a in build and install directories. */
+ libruby_installed,
+ libruby_build,
/* Link to ruby.dll.a, because Windows DLLs don't allow unresolved symbols. */
- "-L" LIBRUBY_LIBDIR,
LIBRUBYARG_SHARED,
"-lmsvcrt",
# ifdef __GNUC__
@@ -1051,6 +1060,12 @@ static void
init_header_filename(void)
{
FILE *f;
+ /* Root path of the running ruby process. Equal to RbConfig::TOPDIR. */
+ VALUE basedir_val;
+ char *basedir;
+
+ basedir_val = rb_const_get(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"));
+ basedir = StringValueCStr(basedir_val);
header_file = xmalloc(strlen(MJIT_HEADER_BUILD_DIR) + 2 + strlen(RUBY_MJIT_HEADER_FILE));
if (header_file == NULL)
@@ -1061,10 +1076,12 @@ init_header_filename(void)
if ((f = fopen(header_file, "r")) == NULL) {
xfree(header_file);
- header_file = xmalloc(strlen(MJIT_HEADER_INSTALL_DIR) + 2 + strlen(RUBY_MJIT_HEADER_FILE));
+ header_file = xmalloc(strlen(basedir) + 1 + strlen(MJIT_HEADER_INSTALL_DIR) + 1 + strlen(RUBY_MJIT_HEADER_FILE) + 1);
if (header_file == NULL)
return;
- strcpy(header_file, MJIT_HEADER_INSTALL_DIR);
+ strcpy(header_file, basedir);
+ strcat(header_file, "/");
+ strcat(header_file, MJIT_HEADER_INSTALL_DIR);
strcat(header_file, "/");
strcat(header_file, RUBY_MJIT_HEADER_FILE);
if ((f = fopen(header_file, "r")) == NULL) {
@@ -1074,6 +1091,16 @@ init_header_filename(void)
}
}
fclose(f);
+
+#ifdef _WIN32
+ libruby_build = xmalloc(2 + strlen(basedir) + 1);
+ strcpy(libruby_build, "-L");
+ strcat(libruby_build, basedir);
+ libruby_installed = xmalloc(2 + strlen(basedir) + 4 + 1);
+ strcpy(libruby_installed, "-L");
+ strcat(libruby_installed, basedir);
+ strcat(libruby_installed, "/lib");
+#endif
}
/* This is called after each fork in the child in to switch off MJIT
diff --git a/ruby.c b/ruby.c
index 925e4cd9561..b185b98a181 100644
--- a/ruby.c
+++ b/ruby.c
@@ -1551,9 +1551,6 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
opt->intern.enc.name = int_enc_name;
}
- if (opt->mjit.on)
- mjit_init(&opt->mjit);
-
if (opt->src.enc.name)
rb_warning("-K is specified; it is for 1.8 compatibility and may cause odd behavior");
@@ -1609,6 +1606,11 @@ process_options(int argc, char **argv, ruby_cmdline_options_t *opt)
ruby_gc_set_params(opt->safe_level);
ruby_init_loadpath_safe(opt->safe_level);
+
+ if (opt->mjit.on)
+ /* Using TMP_RUBY_PREFIX created by ruby_init_loadpath_safe(). */
+ mjit_init(&opt->mjit);
+
Init_enc();
lenc = rb_locale_encoding();
rb_enc_associate(rb_progname, lenc);
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 121664286e3..01802384fee 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -285,7 +285,7 @@ LDSHARED_0 = @if exist $(@).manifest $(MINIRUBY) -run -e wait_writable -- -n 10
LDSHARED_1 = @if exist $(@).manifest $(MANIFESTTOOL) -manifest $(@).manifest -outputresource:$(@);2
LDSHARED_2 = @if exist $(@).manifest @$(RM) $(@:/=\).manifest
!endif
-CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS) -DMJIT_HEADER_BUILD_DIR=\""$(EXTOUT)/include/$(arch)"\" -DLIBRUBYARG_SHARED=\""$(LIBRUBYARG_SHARED)"\" -DLIBRUBY_LIBDIR=\""$(prefix)/lib"\" -DMJIT_HEADER_INSTALL_DIR=\""$(prefix)/include/$(RUBY_BASE_NAME)-$(ruby_version)/$(arch)"\"
+CPPFLAGS = $(DEFS) $(ARCHDEFS) $(CPPFLAGS) -DMJIT_HEADER_BUILD_DIR=\""$(EXTOUT)/include/$(arch)"\" -DLIBRUBYARG_SHARED=\""$(LIBRUBYARG_SHARED)"\" -DMJIT_HEADER_INSTALL_DIR=\""include/$(RUBY_BASE_NAME)-$(ruby_version)/$(arch)"\"
MJIT_HEADER_FLAGS = -P
DLDFLAGS = $(LDFLAGS) -dll