Bug 959597 - Odinmonkey (ARM): fix a commit conflict with bug 964005. r=jandem

This commit is contained in:
Douglas Crosher 2014-01-29 11:39:56 +11:00
parent 47f576082f
commit d113ab06fd

View File

@ -5754,7 +5754,7 @@ static const RegisterSet AllRegsExceptSP =
RegisterSet(GeneralRegisterSet(Registers::AllMask &
~(uint32_t(1) << Registers::StackPointer)),
FloatRegisterSet(FloatRegisters::AllMask));
#if defined(JS_CPU_ARM)
#if defined(JS_CODEGEN_ARM)
// The ARM system ABI also includes d15 in the non volatile float registers.
static const RegisterSet NonVolatileRegs =
RegisterSet(GeneralRegisterSet(Registers::NonVolatileMask),