diff options
| -rw-r--r-- | build/Android.common.mk | 1 | ||||
| -rw-r--r-- | build/Android.libart-compiler-llvm.mk | 1 | ||||
| -rw-r--r-- | src/compiler_llvm/elf_loader.cc | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/build/Android.common.mk b/build/Android.common.mk index 8191b43bed..b2a983e1f0 100644 --- a/build/Android.common.mk +++ b/build/Android.common.mk @@ -187,6 +187,7 @@ LIBART_COMMON_SRC_FILES := \ ifeq ($(ART_USE_LLVM_COMPILER),true) LIBART_COMMON_SRC_FILES += \ + src/compiler_llvm/elf_loader.cc \ src/compiler_llvm/inferred_reg_category_map.cc \ src/compiler_llvm/runtime_support_llvm.cc \ src/compiler_llvm/utils_llvm.cc diff --git a/build/Android.libart-compiler-llvm.mk b/build/Android.libart-compiler-llvm.mk index 9100646b9d..a278517724 100644 --- a/build/Android.libart-compiler-llvm.mk +++ b/build/Android.libart-compiler-llvm.mk @@ -21,7 +21,6 @@ LIBART_COMPILER_LLVM_SRC_FILES += \ src/compiler_llvm/compilation_unit.cc \ src/compiler_llvm/compiler_llvm.cc \ src/compiler_llvm/dalvik_reg.cc \ - src/compiler_llvm/elf_loader.cc \ src/compiler_llvm/frontend.cc \ src/compiler_llvm/generated/art_module.cc \ src/compiler_llvm/inferred_reg_category_map.cc \ diff --git a/src/compiler_llvm/elf_loader.cc b/src/compiler_llvm/elf_loader.cc index ccb02ad2a4..60fce0b2a4 100644 --- a/src/compiler_llvm/elf_loader.cc +++ b/src/compiler_llvm/elf_loader.cc @@ -52,7 +52,7 @@ bool ElfLoader::LoadElfAt(size_t elf_idx, const ElfImage& elf_image) { if (executable == NULL) { LOG(WARNING) << "Failed to load ELF" - << " image: " << elf_image.begin() + << " image: " << static_cast<const void*>(elf_image.begin()) << " size: " << elf_image.size(); return false; } |