Fix small CI issues

JuliaLang · Oct 9, 2017 · 46d89ba · 46d89ba
1 parent ae62e7a
commit 46d89ba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/src/Makefile b/src/Makefile
@@ -187,6 +187,7 @@ $(BUILDDIR)/julia_flisp.boot: $(addprefix $(SRCDIR)/,jlfrontend.scm flisp/aliase
 $(BUILDDIR)/ast.o $(BUILDDIR)/ast.dbg.obj: $(BUILDDIR)/julia_flisp.boot.inc $(SRCDIR)/flisp/*.h
 $(BUILDDIR)/codegen.o $(BUILDDIR)/codegen.dbg.obj: $(addprefix $(SRCDIR)/,\
 	intrinsics.cpp jitlayers.h intrinsics.h debuginfo.h codegen_shared.h cgutils.cpp ccall.cpp abi_*.cpp)
+$(BUILDDIR)/interpreter.o $(BUILDDIR)/interpreter.dbg.obj: $(SRCDIR)/interpreter-stacktrace.c
 $(BUILDDIR)/anticodegen.o $(BUILDDIR)/anticodegen.dbg.obj: $(SRCDIR)/intrinsics.h
 $(BUILDDIR)/debuginfo.o $(BUILDDIR)/debuginfo.dbg.obj: $(SRCDIR)/debuginfo.h
 $(BUILDDIR)/disasm.o $(BUILDDIR)/disasm.dbg.obj: $(SRCDIR)/debuginfo.h

diff --git a/src/interpreter-stacktrace.c b/src/interpreter-stacktrace.c
@@ -10,10 +10,15 @@ extern uintptr_t __stop_jl_interpreter_frame_val;
 uintptr_t __stop_jl_interpreter_frame = (uintptr_t)&__stop_jl_interpreter_frame_val;
 
 #define SECT_INTERP JL_SECTION("jl_interpreter_frame_val")
+#if defined(_CPU_X86_) && defined(_OS_WINDOWS)
+#define MANGLE(x) "@" x "@8"
+#else
 #define MANGLE(x) x
+#endif
 
 #if defined(_OS_LINUX_) || defined(_OS_FREEBSD_)
 #define ASM_ENTRY                               \
+    ".text\n"                                   \
     ".p2align 4,0x90\n"                         \
     ".global enter_interpreter_frame\n"         \
     ".type enter_interpreter_frame,@function\n"