Make frame size dependent on arch-specific constants.
Necessary for proper cross-compiling.
Change-Id: I852901ee6ca5121e480b83a8e318bdc9c7d615e8
diff --git a/compiler/oat_writer.cc b/compiler/oat_writer.cc
index a07aebc..2d45a2f 100644
--- a/compiler/oat_writer.cc
+++ b/compiler/oat_writer.cc
@@ -508,7 +508,12 @@
refs++;
}
}
- size_t sirt_size = StackIndirectReferenceTable::GetAlignedSirtSize(refs);
+ InstructionSet trg_isa = compiler_driver_->GetInstructionSet();
+ size_t pointer_size = 4;
+ if (trg_isa == kArm64 || trg_isa == kX86_64) {
+ pointer_size = 8;
+ }
+ size_t sirt_size = StackIndirectReferenceTable::GetAlignedSirtSizeTarget(pointer_size, refs);
// Get the generic spill masks and base frame size.
mirror::ArtMethod* callee_save_method =