From 136aaee2993a4a5fd93eb9371584161c6d1c7445 Mon Sep 17 00:00:00 2001 From: Dmitry Petrochenko Date: Fri, 6 Jun 2014 15:18:14 +0700 Subject: x86_64: Enable compilation This patch enables compilation of all methods for x86_64 except image. Change-Id: Ie210809f2595cc25da688a4ad0363c258bcf8233 Signed-off-by: Dmitry Petrochenko --- compiler/dex/frontend.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'compiler/dex/frontend.cc') diff --git a/compiler/dex/frontend.cc b/compiler/dex/frontend.cc index d45379712b..aa50b458c4 100644 --- a/compiler/dex/frontend.cc +++ b/compiler/dex/frontend.cc @@ -708,7 +708,6 @@ int x86_64_support_list[] = { // (ARM64) Current calling conversion only support 32bit softfp // which has problems with long, float, double constexpr char arm64_supported_types[] = "ZBSCILVJFD"; -// (x84_64) We still have troubles with compiling longs/doubles/floats constexpr char x86_64_supported_types[] = "ZBSCILVJFD"; // TODO: Remove this when we are able to compile everything. @@ -741,7 +740,7 @@ static bool CanCompileShorty(const char* shorty, InstructionSet instruction_set) static bool CanCompileMethod(uint32_t method_idx, const DexFile& dex_file, CompilationUnit& cu) { // There is some limitation with current ARM 64 backend. - if (cu.instruction_set == kArm64 || cu.instruction_set == kX86_64) { + if (cu.instruction_set == kArm64) { // Check if we can compile the prototype. const char* shorty = dex_file.GetMethodShorty(dex_file.GetMethodId(method_idx)); if (!CanCompileShorty(shorty, cu.instruction_set)) { -- cgit v1.2.3-59-g8ed1b