From c928de90ad22ecdf83c18a07008409595f13d3b1 Mon Sep 17 00:00:00 2001 From: Ian Rogers Date: Wed, 27 Feb 2013 14:30:44 -0800 Subject: Remove Iceland. ART_USE_LLVM_COMPILER is removed and when necessary ART_USE_PORTABLE_COMPILER is used in #ifdefs. Change-Id: Iffa9ce5b0246c7c427ccc4e67ecc134624632e55 --- src/compiler/frontend.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'src/compiler/frontend.cc') diff --git a/src/compiler/frontend.cc b/src/compiler/frontend.cc index 9afd18e4d9..c0f3316720 100644 --- a/src/compiler/frontend.cc +++ b/src/compiler/frontend.cc @@ -28,7 +28,7 @@ #include namespace { -#if !defined(ART_USE_LLVM_COMPILER) +#if !defined(ART_USE_PORTABLE_COMPILER) pthread_once_t llvm_multi_init = PTHREAD_ONCE_INIT; #endif void InitializeLLVMForQuick() { @@ -39,7 +39,7 @@ namespace { namespace art { LLVMInfo::LLVMInfo() { -#if !defined(ART_USE_LLVM_COMPILER) +#if !defined(ART_USE_PORTABLE_COMPILER) pthread_once(&llvm_multi_init, InitializeLLVMForQuick); #endif // Create context, module, intrinsic helper & ir builder @@ -814,7 +814,6 @@ static CompiledMethod* CompileMethod(Compiler& compiler, if ((compiler_backend == kQuickGBC) || (compiler_backend == kPortable)) { cu->gen_bitcode = true; } - DCHECK_NE(compiler_backend, kIceland); // TODO: remove when Portable/Iceland merge complete cu->llvm_info = llvm_info; /* Adjust this value accordingly once inlining is performed */ cu->num_dalvik_registers = code_item->registers_size_; -- cgit v1.2.3-59-g8ed1b