From 0c717dd1c56bd29cf860d0feda8e629dab2cadb3 Mon Sep 17 00:00:00 2001 From: Logan Chien Date: Wed, 28 Mar 2012 18:31:07 +0800 Subject: Add ELF loader to OatFile. Change-Id: I062c3cc78ff9a35d0efcbc9451e7e7ccb055667b --- src/compiler_llvm/compiler_llvm.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/compiler_llvm/compiler_llvm.cc') diff --git a/src/compiler_llvm/compiler_llvm.cc b/src/compiler_llvm/compiler_llvm.cc index 75ced8bf92..2b1890342a 100644 --- a/src/compiler_llvm/compiler_llvm.cc +++ b/src/compiler_llvm/compiler_llvm.cc @@ -27,6 +27,7 @@ #include "jni_compiler.h" #include "method_compiler.h" #include "oat_compilation_unit.h" +#include "oat_file.h" #include "stl_util.h" #include "upcall_compiler.h" @@ -203,7 +204,9 @@ void CompilerLLVM::LoadElfFromCompilationUnit(const CompilationUnit* cunit) { compiler_lock_.AssertHeld(); DCHECK(cunit->IsMaterialized()) << cunit->GetElfIndex(); - if (!elf_loader_->LoadElfAt(cunit->GetElfIndex(), cunit->GetElfImage())) { + if (!elf_loader_->LoadElfAt(cunit->GetElfIndex(), + cunit->GetElfImage(), + OatFile::kRelocAll)) { LOG(ERROR) << "Failed to load ELF from compilation unit " << cunit->GetElfIndex(); } -- cgit v1.2.3-59-g8ed1b