Merge r5931 and r5938 to trunk to fix compilation/linking

src/arm/deoptimizer-arm.cc

Index: src/arm/deoptimizer-arm.cc
===================================================================
--- src/arm/deoptimizer-arm.cc	(revision 5932)
+++ src/arm/deoptimizer-arm.cc	(working copy)
@@ -196,7 +196,7 @@
   // function code and AST id of the bailout.
   output_offset -= kPointerSize;
   input_offset -= kPointerSize;
-  uint32_t value;
+  intptr_t value;
   if (is_bottommost) {
     value = input_->GetFrameSlot(input_offset);
   } else {
@@ -220,7 +220,7 @@
     value = output_[frame_index - 1]->GetFp();
   }
   output_frame->SetFrameSlot(output_offset, value);
-  unsigned fp_value = top_address + output_offset;
+  intptr_t fp_value = top_address + output_offset;
   ASSERT(!is_bottommost || input_->GetRegister(fp.code()) == fp_value);
   output_frame->SetFp(fp_value);
   if (is_topmost) {
@@ -235,7 +235,7 @@
   // optimize functions that need local contexts.
   output_offset -= kPointerSize;
   input_offset -= kPointerSize;
-  value = reinterpret_cast<uint32_t>(function->context());
+  value = reinterpret_cast<intptr_t>(function->context());
   // The context for the bottommost output frame should also agree with the
   // input frame.
   ASSERT(!is_bottommost || input_->GetFrameSlot(input_offset) == value);