diff options
| author | Ian Rogers <irogers@google.com> | 2014-11-05 23:46:43 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-11-13 16:17:46 -0800 |
| commit | d582fa4ea62083a7598dded5b82dc2198b3daac7 (patch) | |
| tree | c76704c266ef4687eab425612ddf3fd24f93fe8d /runtime/Android.mk | |
| parent | f20076ff813b8012096ff31af236d59db3c0f4e1 (diff) | |
| download | art-d582fa4ea62083a7598dded5b82dc2198b3daac7.tar.gz art-d582fa4ea62083a7598dded5b82dc2198b3daac7.tar.bz2 art-d582fa4ea62083a7598dded5b82dc2198b3daac7.zip | |
Instruction set features for ARM64, MIPS and X86.
Also, refactor how feature strings are handled so they are additive or
subtractive.
Make MIPS have features for FPU 32-bit and MIPS v2. Use in the quick compiler
rather than #ifdefs that wouldn't have worked in cross-compilation.
Add SIMD features for x86/x86-64 proposed in:
https://android-review.googlesource.com/#/c/112370/
Bug: 18056890
Change-Id: Ic88ff84a714926bd277beb74a430c5c7d5ed7666
Diffstat (limited to 'runtime/Android.mk')
| -rw-r--r-- | runtime/Android.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/runtime/Android.mk b/runtime/Android.mk index 082e8dd9cd..8ced4d9d61 100644 --- a/runtime/Android.mk +++ b/runtime/Android.mk @@ -73,7 +73,6 @@ LIBART_COMMON_SRC_FILES := \ hprof/hprof.cc \ image.cc \ indirect_reference_table.cc \ - instruction_set.cc \ instrumentation.cc \ intern_table.cc \ interpreter/interpreter.cc \ @@ -165,11 +164,18 @@ LIBART_COMMON_SRC_FILES := \ LIBART_COMMON_SRC_FILES += \ arch/context.cc \ + arch/instruction_set.cc \ + arch/instruction_set_features.cc \ arch/memcmp16.cc \ + arch/arm/instruction_set_features_arm.cc \ arch/arm/registers_arm.cc \ + arch/arm64/instruction_set_features_arm64.cc \ arch/arm64/registers_arm64.cc \ - arch/x86/registers_x86.cc \ + arch/mips/instruction_set_features_mips.cc \ arch/mips/registers_mips.cc \ + arch/x86/instruction_set_features_x86.cc \ + arch/x86/registers_x86.cc \ + arch/x86_64/registers_x86_64.cc \ entrypoints/entrypoint_utils.cc \ entrypoints/interpreter/interpreter_entrypoints.cc \ entrypoints/jni/jni_entrypoints.cc \ @@ -216,7 +222,7 @@ LIBART_TARGET_SRC_FILES := \ LIBART_TARGET_SRC_FILES_arm := \ arch/arm/context_arm.cc.arm \ arch/arm/entrypoints_init_arm.cc \ - arch/arm/instruction_set_features_arm.S \ + arch/arm/instruction_set_features_assembly_tests.S \ arch/arm/jni_entrypoints_arm.S \ arch/arm/memcmp16_arm.S \ arch/arm/portable_entrypoints_arm.S \ @@ -292,7 +298,7 @@ LIBART_HOST_SRC_FILES_64 := \ $(LIBART_SRC_FILES_x86_64) LIBART_ENUM_OPERATOR_OUT_HEADER_FILES := \ - arch/x86_64/registers_x86_64.h \ + arch/instruction_set.h \ base/allocator.h \ base/mutex.h \ debugger.h \ @@ -306,7 +312,6 @@ LIBART_ENUM_OPERATOR_OUT_HEADER_FILES := \ gc/heap.h \ instrumentation.h \ indirect_reference_table.h \ - instruction_set.h \ invoke_type.h \ jdwp/jdwp.h \ jdwp/jdwp_constants.h \ |