From: Andrew Kaylor <andrew.kaylor@intel.com>
Date: Thu, 21 Feb 2013 23:45:19 +0000 (+0000)
Subject: Change to JITDefault code model for ELF targets
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cd5c7247ab895dfe4197e08736d025e807ce9bca;p=platform%2Fupstream%2Fllvm.git

Change to JITDefault code model for ELF targets

On x86-64 platforms, the small code model assumes that code will be loaded below the 2GB boundary.  With the static relocation model, the fact that the expression code is initially loaded (in the LLDB debugger address space) above that boundary causes problems.  Switching to the JITDefault code model causes the large code model to be used for 64-bit targets and small code model of 32-bit targets.

llvm-svn: 175828
---

diff --git a/lldb/source/Expression/ClangExpressionParser.cpp b/lldb/source/Expression/ClangExpressionParser.cpp
index 05e26e1..1d86c91 100644
--- a/lldb/source/Expression/ClangExpressionParser.cpp
+++ b/lldb/source/Expression/ClangExpressionParser.cpp
@@ -609,10 +609,18 @@ ClangExpressionParser::PrepareForExecution (lldb::addr_t &func_allocation_addr,
     llvm::Triple triple(module_ap->getTargetTriple());
     llvm::Function *function = module_ap->getFunction (function_name.c_str());
     llvm::Reloc::Model relocModel;
+    llvm::CodeModel::Model codeModel;
     if (triple.isOSBinFormatELF())
+    {
         relocModel = llvm::Reloc::Static;
+        // This will be small for 32-bit and large for 64-bit.
+        codeModel = llvm::CodeModel::JITDefault;
+    }
     else
+    {
         relocModel = llvm::Reloc::PIC_;
+        codeModel = llvm::CodeModel::Small;
+    }
     EngineBuilder builder(module_ap.release());
     builder.setEngineKind(EngineKind::JIT)
         .setErrorStr(&error_string)
@@ -620,7 +628,7 @@ ClangExpressionParser::PrepareForExecution (lldb::addr_t &func_allocation_addr,
         .setJITMemoryManager(jit_memory_manager)
         .setOptLevel(CodeGenOpt::Less)
         .setAllocateGVsWithCode(true)
-        .setCodeModel(CodeModel::Small)
+        .setCodeModel(codeModel)
         .setUseMCJIT(true);
     
     StringRef mArch;