From b3cd1229e6904365ca0ca2a7bbc4701ad1908154 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 9 Mar 2012 16:00:38 -0800 Subject: Really fix build. Change-Id: I09c76b8fede9e926519b206010ba6c7ab44c3216 --- src/compiler/codegen/MethodCodegenDriver.cc | 6 +++++- src/compiler/codegen/mips/MipsRallocUtil.cc | 8 -------- 2 files changed, 5 insertions(+), 9 deletions(-) (limited to 'src/compiler/codegen') diff --git a/src/compiler/codegen/MethodCodegenDriver.cc b/src/compiler/codegen/MethodCodegenDriver.cc index db491f1836..6b3283e13f 100644 --- a/src/compiler/codegen/MethodCodegenDriver.cc +++ b/src/compiler/codegen/MethodCodegenDriver.cc @@ -40,7 +40,11 @@ RegLocation oatGetReturn(CompilationUnit* cUnit) { 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; } diff --git a/src/compiler/codegen/mips/MipsRallocUtil.cc b/src/compiler/codegen/mips/MipsRallocUtil.cc index 41bc991704..7fd9b598cd 100644 --- a/src/compiler/codegen/mips/MipsRallocUtil.cc +++ b/src/compiler/codegen/mips/MipsRallocUtil.cc @@ -158,14 +158,6 @@ extern RegLocation oatGetReturnAlt(CompilationUnit* cUnit) 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] -- cgit v1.2.3-59-g8ed1b