Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-05 05:30:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 984018 - Fixed build on Arm64. r=nbp

Browse Source 
--HG--
extra : rebase_source : cee1b06da3fb8c8ae8a260498e365bc2fc382ba8
This commit is contained in:
Victor Carlquist 2015-09-17 09:24:36 -03:00
parent d0c4a9db1b
commit 2f51a9688a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jit/arm64/vixl/MozSimulator-vixl.cpp
View File

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

8
js/src/jit/shared/Lowering-shared-inl.h
View File

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