diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-12 11:51:02 -0700 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-12 11:51:02 -0700 |
| commit | ffb939a0709ccb100d450e6e30d4c1ca85132163 (patch) | |
| tree | 9c16e4e7a125004e4d4abcf32676802c426dea97 /dex2oat | |
| parent | fbe40f54d31e8a79c08be64e6e950681a2733242 (diff) | |
| download | art-ffb939a0709ccb100d450e6e30d4c1ca85132163.tar.gz art-ffb939a0709ccb100d450e6e30d4c1ca85132163.tar.bz2 art-ffb939a0709ccb100d450e6e30d4c1ca85132163.zip | |
Set default dex2oat instruction set for x86-64 and ARM64.
Change-Id: I43062dfadb8a4f51304fd06f0105d6af81cf0331
Diffstat (limited to 'dex2oat')
| -rw-r--r-- | dex2oat/dex2oat.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/dex2oat/dex2oat.cc b/dex2oat/dex2oat.cc index cc78816546..327d3fba28 100644 --- a/dex2oat/dex2oat.cc +++ b/dex2oat/dex2oat.cc @@ -738,8 +738,12 @@ static int dex2oat(int argc, char** argv) { #if defined(__arm__) InstructionSet instruction_set = kThumb2; +#elif defined(__aarch64__) + InstructionSet instruction_set = kArm64; #elif defined(__i386__) InstructionSet instruction_set = kX86; +#elif defined(__x86_64__) + InstructionSet instruction_set = kX86_64; #elif defined(__mips__) InstructionSet instruction_set = kMips; #else |