commit fd2ec5473d9c63b15dbc28c8a5996c83120cb8ae
author Brian Carlstrom <bdc@google.com> Wed May 02 15:08:57 2012 -0700
committer Elliott Hughes <enh@google.com> Fri Jun 01 10:28:42 2012 -0700
tree afaf2523cbb7a82548de599075d216c8eaa66624
parent 526643e38c344701d96068f351548a393c67b6be

Fix compilation issues with new gcc

(cherry picked from commit efad79fa4121e20ab613e31bde44cc3120f23832)

Conflicts:

	src/compiler/codegen/mips/Mips32/Factory.cc
	src/compiler/codegen/x86/X86/Factory.cc

Change-Id: I5e0e9dc48ba76092cccc70b25668978a08a5449b

src/oat/runtime/support_stubs.cc

diff --git a/src/oat/runtime/support_stubs.cc b/src/oat/runtime/support_stubs.cc
index ac5d6f9..2a46c8b 100644
--- a/src/oat/runtime/support_stubs.cc
+++ b/src/oat/runtime/support_stubs.cc
@@ -89,8 +89,10 @@
   bool is_static;
   bool is_virtual;
   uint32_t dex_method_idx;
+#if !defined(__i386__)
   const char* shorty;
   uint32_t shorty_len;
+#endif
   if (type == Runtime::kUnknownMethod) {
     DCHECK(called->IsRuntimeMethod());
     // less two as return address may span into next dex instruction
@@ -109,15 +111,19 @@
            (instr_code == Instruction::INVOKE_DIRECT_RANGE));
     DecodedInstruction dec_insn(instr);
     dex_method_idx = dec_insn.vB;
+#if !defined(__i386__)
     shorty = linker->MethodShorty(dex_method_idx, caller, &shorty_len);
+#endif
   } else {
     DCHECK(!called->IsRuntimeMethod());
     is_static = type == Runtime::kStaticMethod;
     is_virtual = false;
     dex_method_idx = called->GetDexMethodIndex();
+#if !defined(__i386__)
     MethodHelper mh(called);
     shorty = mh.GetShorty();
     shorty_len = mh.GetShortyLength();
+#endif
   }
 #if !defined(__i386__)
   // Discover shorty (avoid GCs)