Bug 984018 - Fixed build on Arm64; r=nbp

This commit is contained in:
Victor Carlquist 2015-09-17 09:24:36 -03:00
parent d3fdd49cf4
commit 913c915588
2 changed files with 3 additions and 1 deletions

View File

@ -120,7 +120,9 @@ void Simulator::init(Decoder* decoder, FILE* stream) {
lock_ = PR_NewLock();
if (!lock_)
MOZ_CRASH("Could not allocate simulator lock.");
#ifdef DEBUG
lockOwner_ = nullptr;
#endif
redirection_ = nullptr;
}

View File

@ -185,7 +185,7 @@ LIRGeneratorShared::defineSinCos(LInstructionHelper<2, Ops, Temps> *lir, MDefini
uint32_t vreg = getVirtualRegister();
lir->setDef(0, LDefinition(vreg, LDefinition::DOUBLE, LFloatReg(ReturnDoubleReg)));
#if defined(JS_CODEGEN_ARM) || defined(JS_CODEGEN_ARM64)
lir->setDef(1, LDefinition(vreg + VREG_INCREMENT, LDefinition::DOUBLE, LFloatReg(d1)));
lir->setDef(1, LDefinition(vreg + VREG_INCREMENT, LDefinition::DOUBLE, LFloatReg(FloatRegisters::d1)));
#elif defined(JS_CODEGEN_MIPS32)
lir->setDef(1, LDefinition(vreg + VREG_INCREMENT, LDefinition::DOUBLE, LFloatReg(f2)));
#elif defined(JS_CODEGEN_NONE)