1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

mjit.c: completely separate compile_c_to_so

Browse Source 
by whether on mswin or not.

This is needed because I'm going to renew the compilation process for
unix, keeping mswin builds as it is, at first.

This commit is not changing the behavior at all.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64051 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
k0kubun 2018-07-25 13:54:00 +00:00
parent f10582d8e7
commit 40bb70c7eb
1 changed files with 43 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
mjit.c
View File

@ -741,34 +741,18 @@ make_pch(void)
#define append_str(p, str) append_str2(p, str, sizeof(str)-1) #define append_str(p, str) append_str2(p, str, sizeof(str)-1)
#define append_lit(p, str) append_str2(p, str, rb_strlen_lit(str)) #define append_lit(p, str) append_str2(p, str, rb_strlen_lit(str))
/* Compile C file to so. It returns 1 if it succeeds. */ #ifdef _MSC_VER
/* Compile C file to so. It returns 1 if it succeeds. (mswin) */
static int static int
compile_c_to_so(const char *c_file, const char *so_file) compile_c_to_so(const char *c_file, const char *so_file)
{ {
int exit_code; int exit_code;
const char *files[] = { const char *files[] = { NULL, NULL, "-link", libruby_pathflag, NULL };
#ifndef _MSC_VER
"-o",
#endif
NULL, NULL,
#ifdef __clang__
"-include-pch", NULL,
#endif
#ifdef _WIN32
# ifdef _MSC_VER
"-link",
# endif
libruby_pathflag,
#endif
NULL,
};
char **args; char **args;
#ifdef _MSC_VER
char *p; char *p;
int solen; int solen;
#endif
#ifdef _MSC_VER
solen = strlen(so_file); solen = strlen(so_file);
files[0] = p = (char *)malloc(sizeof(char) * (rb_strlen_lit("-Fe") + solen + 1)); files[0] = p = (char *)malloc(sizeof(char) * (rb_strlen_lit("-Fe") + solen + 1));
if (p == NULL) if (p == NULL)
@ -777,13 +761,6 @@ compile_c_to_so(const char *c_file, const char *so_file)
p = append_str2(p, so_file, solen); p = append_str2(p, so_file, solen);
*p = '\0'; *p = '\0';
files[1] = c_file; files[1] = c_file;
#else
# ifdef __clang__
files[4] = pch_file;
# endif
files[2] = c_file;
files[1] = so_file;
#endif
args = form_args(5, CC_LDSHARED_ARGS, CC_CODEFLAG_ARGS, args = form_args(5, CC_LDSHARED_ARGS, CC_CODEFLAG_ARGS,
files, CC_LIBS, CC_DLDFLAGS_ARGS); files, CC_LIBS, CC_DLDFLAGS_ARGS);
if (args == NULL) if (args == NULL)
@ -791,15 +768,52 @@ 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);
free(args); free(args);
#ifdef _MSC_VER
free((char *)files[0]); free((char *)files[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);
return exit_code == 0; return exit_code == 0;
} }
#else
/* Compile C file to so. It returns 1 if it succeeds. (non-mswin) */
static int
compile_c_to_so(const char *c_file, const char *so_file)
{
int exit_code;
const char *files[] = {
"-o", NULL, NULL,
# ifdef __clang__
"-include-pch", NULL,
# endif
# ifdef _WIN32
libruby_pathflag,
# endif
NULL,
};
char **args;
# ifdef __clang__
files[4] = pch_file;
# endif
files[2] = c_file;
files[1] = so_file;
args = form_args(5, CC_LDSHARED_ARGS, CC_CODEFLAG_ARGS,
files, CC_LIBS, CC_DLDFLAGS_ARGS);
if (args == NULL)
return FALSE;
exit_code = exec_process(cc_path, args);
free(args);
if (exit_code != 0)
verbose(2, "compile_c_to_so: compile error: %d", exit_code);
return exit_code == 0;
}
#endif
static void * static void *
load_func_from_so(const char *so_file, const char *funcname, struct rb_mjit_unit *unit) load_func_from_so(const char *so_file, const char *funcname, struct rb_mjit_unit *unit)
{ {