diff options
| author | Ian Rogers <irogers@google.com> | 2014-03-06 01:13:39 -0800 |
|---|---|---|
| committer | Ian Rogers <irogers@google.com> | 2014-03-06 01:34:07 -0800 |
| commit | befbd5731ecca08f08780ee28a913d08ffb14656 (patch) | |
| tree | ee359fc38671950afa91d96bf8c29232a799b628 /compiler/elf_writer_quick.cc | |
| parent | 97c3d61e46a3678dac848578c686c724ec3397fa (diff) | |
| download | android_art-befbd5731ecca08f08780ee28a913d08ffb14656.tar.gz android_art-befbd5731ecca08f08780ee28a913d08ffb14656.tar.bz2 android_art-befbd5731ecca08f08780ee28a913d08ffb14656.zip | |
Fix host architecture for 64bit.
Also, hack x86 assembler for use as a x86-64 trampoline compiler's assembler.
Implement missing x86-64 quick resolution trampoline.
Add x86-64 to the quick elf writer.
Change-Id: I08216c67014a83492ada12898ab8000218ba7bb4
Diffstat (limited to 'compiler/elf_writer_quick.cc')
| -rw-r--r-- | compiler/elf_writer_quick.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/compiler/elf_writer_quick.cc b/compiler/elf_writer_quick.cc index 4b823ef5ec..a6daa5d00d 100644 --- a/compiler/elf_writer_quick.cc +++ b/compiler/elf_writer_quick.cc @@ -377,6 +377,11 @@ bool ElfWriterQuick::Write(OatWriter* oat_writer, elf_header.e_flags = 0; break; } + case kX86_64: { + elf_header.e_machine = EM_X86_64; + elf_header.e_flags = 0; + break; + } case kMips: { elf_header.e_machine = EM_MIPS; elf_header.e_flags = (EF_MIPS_NOREORDER | |