kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

mjit mswin support (WIP)

Browse source 
* mjit.c (compile_c_to_so): fixed broken xfree position.

	* mjit.c (init_header_filename): refactored.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62273 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-02-07 03:21:28 +00:00
parent 0abd9b7f25
commit da83d210e0
1 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

29
mjit.c
View file

@ -682,7 +682,6 @@ compile_c_to_so(const char *c_file, const char *so_file)
} }
args = form_args(4, (mjit_opts.debug ? VC_COMMON_ARGS_DEBUG : VC_COMMON_ARGS), args = form_args(4, (mjit_opts.debug ? VC_COMMON_ARGS_DEBUG : VC_COMMON_ARGS),
output, input, libs); output, input, libs);
xfree(output[0]);
#else #else
output[1] = so_file; output[1] = so_file;
if (mjit_opts.cc == MJIT_CC_CLANG) { if (mjit_opts.cc == MJIT_CC_CLANG) {
@ -700,6 +699,9 @@ compile_c_to_so(const char *c_file, const char *so_file)
exit_code = exec_process(cc_path, args); exit_code = exec_process(cc_path, args);
xfree(args); xfree(args);
#ifdef _MSC_VER
xfree((char *)output[0]);
#endif
if (exit_code != 0) if (exit_code != 0)
verbose(2, "compile_c_to_so: compile error: %d", exit_code); verbose(2, "compile_c_to_so: compile error: %d", exit_code);
@ -1110,6 +1112,15 @@ init_header_filename(void)
static const char header_name[] = static const char header_name[] =
"/" MJIT_HEADER_INSTALL_DIR "/" RUBY_MJIT_HEADER_FILE; "/" MJIT_HEADER_INSTALL_DIR "/" RUBY_MJIT_HEADER_FILE;
char *p; char *p;
#ifdef _WIN32
static const char libpathflag[] =
# ifdef _MSC_VER
"-LIBPATH:"
# else
"-L"
# endif
;
#endif
basedir_val = rb_const_get(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX")); basedir_val = rb_const_get(rb_cObject, rb_intern_const("TMP_RUBY_PREFIX"));
basedir = StringValuePtr(basedir_val); basedir = StringValuePtr(basedir_val);
@ -1128,20 +1139,12 @@ init_header_filename(void)
fclose(f); fclose(f);
#ifdef _WIN32 #ifdef _WIN32
# ifdef _MSC_VER p = libruby_build = xmalloc(sizeof(libpathflag)-1 + baselen + 1);
p = libruby_build = xmalloc(9 + baselen + 1); p = append_str(p, libpathflag);
p = append_str(p, "-LIBPATH:");
#else
p = libruby_build = xmalloc(2 + baselen + 1);
p = append_str(p, "-L");
#endif
p = append_str2(p, basedir, baselen); p = append_str2(p, basedir, baselen);
*p = '\0'; *p = '\0';
# ifdef _MSC_VER
libruby_installed = xmalloc(9 + baselen + 4 + 1); libruby_installed = xmalloc(sizeof(libpathflag)-1 + baselen + 4 + 1);
#else
libruby_installed = xmalloc(2 + baselen + 4 + 1);
#endif
p = append_str2(libruby_installed, libruby_build, p - libruby_build); p = append_str2(libruby_installed, libruby_build, p - libruby_build);
p = append_str(p, "/lib"); p = append_str(p, "/lib");
*p = '\0'; *p = '\0';