commit b3cd1229e6904365ca0ca2a7bbc4701ad1908154
author Elliott Hughes <enh@google.com> Fri Mar 09 16:00:38 2012 -0800
committer Elliott Hughes <enh@google.com> Fri Mar 09 16:00:38 2012 -0800
tree d499bee2134f38253118461070e6e11b2b33c4fc
parent e7825db4cfe76eabf5e3ebc0358b5e067ca3f484

Really fix build.

Change-Id: I09c76b8fede9e926519b206010ba6c7ab44c3216

src/compiler/codegen/MethodCodegenDriver.cc

diff --git a/src/compiler/codegen/MethodCodegenDriver.cc b/src/compiler/codegen/MethodCodegenDriver.cc
index db491f1..6b3283e 100644
--- a/src/compiler/codegen/MethodCodegenDriver.cc
+++ b/src/compiler/codegen/MethodCodegenDriver.cc
@@ -40,7 +40,11 @@
 {
     RegLocation res = LOC_C_RETURN;
     oatClobber(cUnit, res.lowReg);
-    oatLockTemp(cUnit, res.lowReg);
+    if (cUnit->instructionSet == kMips) {
+        oatMarkInUse(cUnit, res.lowReg);
+    } else {
+        oatLockTemp(cUnit, res.lowReg);
+    }
     return res;
 }
 

src/compiler/codegen/mips/MipsRallocUtil.cc

diff --git a/src/compiler/codegen/mips/MipsRallocUtil.cc b/src/compiler/codegen/mips/MipsRallocUtil.cc
index 41bc991..7fd9b59 100644
--- a/src/compiler/codegen/mips/MipsRallocUtil.cc
+++ b/src/compiler/codegen/mips/MipsRallocUtil.cc
@@ -158,14 +158,6 @@
     return res;
 }
 
-extern RegLocation oatGetReturn(CompilationUnit* cUnit)
-{
-    RegLocation res = LOC_C_RETURN;
-    oatClobber(cUnit, res.lowReg);
-    oatMarkInUse(cUnit, res.lowReg);
-    return res;
-}
-
 extern RegisterInfo* oatGetRegInfo(CompilationUnit* cUnit, int reg)
 {
     return FPREG(reg) ? &cUnit->regPool->FPRegs[reg & FP_REG_MASK]