diff options
| author | 2013-02-27 14:30:44 -0800 | |
|---|---|---|
| committer | 2013-02-27 14:30:44 -0800 | |
| commit | c928de90ad22ecdf83c18a07008409595f13d3b1 (patch) | |
| tree | 065a08f379960f7ba946318aaa742d7ddd0c94bd /src/class_linker.cc | |
| parent | 0f827169742aad6209d830db773a101849c32a83 (diff) | |
Remove Iceland.
ART_USE_LLVM_COMPILER is removed and when necessary ART_USE_PORTABLE_COMPILER
is used in #ifdefs.
Change-Id: Iffa9ce5b0246c7c427ccc4e67ecc134624632e55
Diffstat (limited to 'src/class_linker.cc')
| -rw-r--r-- | src/class_linker.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/class_linker.cc b/src/class_linker.cc index 56c37fdae8..a00b4b9c74 100644 --- a/src/class_linker.cc +++ b/src/class_linker.cc @@ -57,7 +57,7 @@ #include "os.h" #include "runtime.h" #include "runtime_support.h" -#if defined(ART_USE_LLVM_COMPILER) +#if defined(ART_USE_PORTABLE_COMPILER) #include "compiler_llvm/runtime_support_llvm.h" #endif #include "ScopedLocalRef.h" @@ -2569,7 +2569,7 @@ mirror::AbstractMethod* ClassLinker::CreateProxyMethod(Thread* self, SirtRef<mir method->SetCoreSpillMask(refs_and_args->GetCoreSpillMask()); method->SetFpSpillMask(refs_and_args->GetFpSpillMask()); method->SetFrameSizeInBytes(refs_and_args->GetFrameSizeInBytes()); -#if !defined(ART_USE_LLVM_COMPILER) +#if !defined(ART_USE_PORTABLE_COMPILER) method->SetCode(reinterpret_cast<void*>(art_quick_proxy_invoke_handler)); #else OatFile::OatMethod oat_method = GetOatMethodFor(prototype.get()); |