diff options
| author | Elliott Hughes <enh@google.com> | 2013-06-05 20:30:48 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2013-06-05 20:30:49 +0000 |
| commit | 91027c67a3924429bc6fc94a7f28893d9d09c900 (patch) | |
| tree | 46ed8e3137236d0248c9c797b278cfe53af4798f /vm/compiler/codegen | |
| parent | f3079bdadf30d93b37e0a59a8787c636027a36f5 (diff) | |
| parent | 4a9a14105bc3c3e3ad135e3d5d2b3b6abdd45956 (diff) | |
| download | android_dalvik-91027c67a3924429bc6fc94a7f28893d9d09c900.tar.gz android_dalvik-91027c67a3924429bc6fc94a7f28893d9d09c900.tar.bz2 android_dalvik-91027c67a3924429bc6fc94a7f28893d9d09c900.zip | |
Merge "Remove unused compiler templates for armv7-a*"
Diffstat (limited to 'vm/compiler/codegen')
4 files changed, 6 insertions, 6 deletions
diff --git a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp index 40ee04072..0b1e0cdeb 100644 --- a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp +++ b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.cpp @@ -27,7 +27,7 @@ JitInstructionSetType dvmCompilerInstructionSet(void) /* First, declare dvmCompiler_TEMPLATE_XXX for each template */ #define JIT_TEMPLATE(X) extern "C" void dvmCompiler_TEMPLATE_##X(); -#include "../../../template/armv5te-vfp/TemplateOpList.h" +#include "../../../template/armv7-a-neon/TemplateOpList.h" #undef JIT_TEMPLATE /* Architecture-specific initializations and checks go here */ @@ -41,7 +41,7 @@ bool dvmCompilerArchVariantInit(void) */ #define JIT_TEMPLATE(X) templateEntryOffsets[i++] = \ (intptr_t) dvmCompiler_TEMPLATE_##X - (intptr_t) dvmCompilerTemplateStart; -#include "../../../template/armv5te-vfp/TemplateOpList.h" +#include "../../../template/armv7-a-neon/TemplateOpList.h" #undef JIT_TEMPLATE /* Target-specific configuration */ diff --git a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.h b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.h index 33e262cec..0cb82f654 100644 --- a/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.h +++ b/vm/compiler/codegen/arm/armv7-a-neon/ArchVariant.h @@ -20,7 +20,7 @@ /* Create the TemplateOpcode enum */ #define JIT_TEMPLATE(X) TEMPLATE_##X, typedef enum { -#include "../../../template/armv5te-vfp/TemplateOpList.h" +#include "../../../template/armv7-a-neon/TemplateOpList.h" /* * For example, * TEMPLATE_CMP_LONG, diff --git a/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp b/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp index 40ee04072..c698f6267 100644 --- a/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp +++ b/vm/compiler/codegen/arm/armv7-a/ArchVariant.cpp @@ -27,7 +27,7 @@ JitInstructionSetType dvmCompilerInstructionSet(void) /* First, declare dvmCompiler_TEMPLATE_XXX for each template */ #define JIT_TEMPLATE(X) extern "C" void dvmCompiler_TEMPLATE_##X(); -#include "../../../template/armv5te-vfp/TemplateOpList.h" +#include "../../../template/armv7-a/TemplateOpList.h" #undef JIT_TEMPLATE /* Architecture-specific initializations and checks go here */ @@ -41,7 +41,7 @@ bool dvmCompilerArchVariantInit(void) */ #define JIT_TEMPLATE(X) templateEntryOffsets[i++] = \ (intptr_t) dvmCompiler_TEMPLATE_##X - (intptr_t) dvmCompilerTemplateStart; -#include "../../../template/armv5te-vfp/TemplateOpList.h" +#include "../../../template/armv7-a/TemplateOpList.h" #undef JIT_TEMPLATE /* Target-specific configuration */ diff --git a/vm/compiler/codegen/arm/armv7-a/ArchVariant.h b/vm/compiler/codegen/arm/armv7-a/ArchVariant.h index b4f4eb7b7..8003f734f 100644 --- a/vm/compiler/codegen/arm/armv7-a/ArchVariant.h +++ b/vm/compiler/codegen/arm/armv7-a/ArchVariant.h @@ -20,7 +20,7 @@ /* Create the TemplateOpcode enum */ #define JIT_TEMPLATE(X) TEMPLATE_##X, enum TemplateOpcode { -#include "../../../template/armv5te-vfp/TemplateOpList.h" +#include "../../../template/armv7-a/TemplateOpList.h" /* * For example, * TEMPLATE_CMP_LONG, |