force the LLVM JIT to pick a memory model compatible with the LLVM Me…

…moryManager
JuliaLang · Jun 1, 2016 · 7086ff0 · 7086ff0
1 parent e56c2a1
commit 7086ff0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/codegen.cpp b/src/codegen.cpp
@@ -5743,13 +5743,13 @@ extern "C" void jl_init_codegen(void)
         .setMCJITMemoryManager(std::unique_ptr<RTDyldMemoryManager>{new SectionMemoryManager()})
 #endif
         .setTargetOptions(options)
-#if (defined(_OS_LINUX_) && defined(_CPU_X86_64_)) || defined(CODEGEN_TLS)
+#if (defined(_OS_LINUX_) && defined(_CPU_X86_64_))
         .setRelocationModel(Reloc::PIC_)
 #elif !defined(LLVM39)
         .setRelocationModel(Reloc::Default)
 #endif
-#ifdef CODEGEN_TLS
-        .setCodeModel(CodeModel::Small)
+#ifdef _P64
+        .setCodeModel(CodeModel::Large)
 #else
         .setCodeModel(CodeModel::JITDefault)
 #endif

diff --git a/src/options.h b/src/options.h
@@ -113,9 +113,9 @@
 #  define MEMDEBUG
 #  define KEEP_BODIES
 #  endif
-// Memory sanitizer also needs thread-local storage
+// Memory sanitizer needs TLS, which llvm only supports for the small memory model
 #  if __has_feature(memory_sanitizer)
-#  define CODEGEN_TLS
+   // todo: fix the llvm MemoryManager to work with small memory model
 #  endif
 #endif