225a226,227
> unsigned RegSize = Subtarget.isGP32bit() ? 4 : 8;
> bool HasGP = MipsFI->needGPSaveRestore();
250a253,255
> unsigned StackOffset = HasGP ? (MipsFI->getGPStackOffset()+RegSize)
> : (Subtarget.isABI_O32() ? 16 : 0);
>
259c264,265
< unsigned Offset = MFI->getObjectOffset(i) - CalleeSavedAreaSize;
---
> unsigned Offset =
> StackOffset + MFI->getObjectOffset(i) - CalleeSavedAreaSize;
268,272c274,275
< // be saved in this CPU Area there is the need. This whole Area must
< // be aligned to the default Stack Alignment requirements.
< unsigned StackOffset = 0;
< unsigned RegSize = Subtarget.isGP32bit() ? 4 : 8;
<
---
> // be saved in this CPU Area. This whole area must be aligned to the
> // default Stack Alignment requirements.
286c289,292
< if (hasFP(MF)) {
---
> // Stack locations for FP and RA. If only one of them is used,
> // the space must be allocated for both, otherwise no space at all.
> if (hasFP(MF) || MFI->hasCalls()) {
> // FP stack location
292d297
< }
294c299
< if (MFI->hasCalls()) {
---
> // SP stack location
298d302
< TopCPUSavedRegOff = StackOffset;
299a304,306
>
> if (MFI->hasCalls())
> TopCPUSavedRegOff += RegSize;
300a308
>