commit 225ade2eef559a8609879f142789a4f59aec5704
author Ian Rogers <irogers@google.com> Mon Mar 18 17:45:44 2013 -0700
committer Ian Rogers <irogers@google.com> Mon Mar 18 17:45:44 2013 -0700
tree 30b53ffb7a0ecea04dff068dd6ee5047fed76070
parent 4f6ad8ab428038129b2d0d6c40b7fd625cca15e1

Fix portable build.

Silence x86 assembler warning.

Change-Id: I828363273a289bdd941a87ca1b368220be3f5d1f

src/elf_writer.cc

diff --git a/src/elf_writer.cc b/src/elf_writer.cc
index 5637f7c..7f90468 100644
--- a/src/elf_writer.cc
+++ b/src/elf_writer.cc
@@ -31,10 +31,12 @@
 #include "class_linker.h"
 #include "compiler/driver/compiler_driver.h"
 #include "compiler/llvm/utils_llvm.h"
+#include "dex_file-inl.h"
 #include "dex_method_iterator.h"
 #include "elf_file.h"
 #include "invoke_type.h"
 #include "mirror/abstract_method-inl.h"
+#include "mirror/object-inl.h"
 #include "oat.h"
 #include "oat_file.h"
 #include "scoped_thread_state_change.h"

src/oat/runtime/x86/runtime_support_x86.S

diff --git a/src/oat/runtime/x86/runtime_support_x86.S b/src/oat/runtime/x86/runtime_support_x86.S
index 32d657d..76af338 100644
--- a/src/oat/runtime/x86/runtime_support_x86.S
+++ b/src/oat/runtime/x86/runtime_support_x86.S
@@ -333,7 +333,7 @@
     mov 4(%esp), %ecx             // copy arg1 into ecx
     mov 8(%esp), %edx             // copy arg2 into edx
     mov 12(%esp), %ebx            // copy arg3 into ebx
-    call METHOD_CODE_OFFSET(%eax) // call the method
+    call *METHOD_CODE_OFFSET(%eax) // call the method
     mov %ebp, %esp                // restore stack pointer
     POP ebx                       // pop ebx
     POP ebp                       // pop ebp