summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mjit.c12
-rw-r--r--win32/Makefile.sub6
2 files changed, 14 insertions, 4 deletions
diff --git a/mjit.c b/mjit.c
index 31d83d0..efe35ee 100644
--- a/mjit.c
+++ b/mjit.c
@@ -732,7 +732,7 @@ static int
compile_c_to_so(const char *c_file, const char *so_file)
{
int exit_code;
- const char *files[] = { NULL, NULL, NULL, "-link", libruby_pathflag, NULL };
+ const char *files[] = { NULL, NULL, NULL, NULL, "-link", libruby_pathflag, NULL };
char **args;
char *p;
@@ -748,7 +748,13 @@ compile_c_to_so(const char *c_file, const char *so_file)
p = append_str2(p, pch_file, strlen(pch_file));
*p = '\0';
- files[2] = c_file;
+ /* files[2] = "C:/.../rb_mjit_header-*.obj" */
+ files[2] = p = (char *)alloca(sizeof(char) * (strlen(pch_file) + 1));
+ p = append_str2(p, pch_file, strlen(pch_file) - strlen(".pch"));
+ p = append_lit(p, ".obj");
+ *p = '\0';
+
+ files[3] = c_file;
args = form_args(5, CC_LDSHARED_ARGS, CC_CODEFLAG_ARGS,
files, CC_LIBS, CC_DLDFLAGS_ARGS);
if (args == NULL)
@@ -1801,7 +1807,7 @@ mjit_finish(void)
return;
/* Wait for pch finish */
- verbose(2, "Canceling pch and worker threads");
+ verbose(2, "Canceling worker thread");
CRITICAL_SECTION_START(3, "in mjit_finish to wakeup from pch");
/* As our threads are detached, we could just cancel them. But it
is a bad idea because OS processes (C compiler) started by
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index 862da1a..d07e843 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -316,9 +316,13 @@ MJIT_PRECOMPILED_HEADER = $(MJIT_HEADER_INSTALL_DIR)/$(MJIT_PRECOMPILED_HEADER_N
MJIT_CC = $(CC)
!endif
!ifndef MJIT_OPTFLAGS
-MJIT_OPTFLAGS = $(OPTFLAGS)
+# Short-term TODO: Include `$(XCFLAGS) $(CPPFLAGS)` to suppress warning. Currently adding them breakes JIT.
+# Long-term TODO: Use only $(OPTFLAGS) for performance. It requires to modify flags for precompiled header too.
+# Using flags used for building precompiled header to make JIT succeed.
+MJIT_OPTFLAGS = -DMJIT_HEADER $(CFLAGS)
!endif
!ifndef MJIT_DEBUGFLAGS
+# TODO: Make this work... Another header for debug build needs to be installed first.
MJIT_DEBUGFLAGS = $(DEBUGFLAGS)
!endif
!ifndef MJIT_LDSHARED