Reviewers: Rico, Description: Merge r5931 and r5938 to trunk to fix compilation/linking issues on ARM.
Please review this at http://codereview.chromium.org/5563010/ SVN Base: http://v8.googlecode.com/svn/trunk/ Affected files: M src/arm/deoptimizer-arm.cc M src/version.cc M tools/gyp/v8.gyp 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); Index: src/version.cc =================================================================== --- src/version.cc (revision 5932) +++ src/version.cc (working copy) @@ -35,7 +35,7 @@ #define MAJOR_VERSION 3 #define MINOR_VERSION 0 #define BUILD_NUMBER 0 -#define PATCH_LEVEL 0 +#define PATCH_LEVEL 1 #define CANDIDATE_VERSION false // Define SONAME to have the SCons build the put a specific SONAME into the Index: tools/gyp/v8.gyp =================================================================== --- tools/gyp/v8.gyp (revision 5932) +++ tools/gyp/v8.gyp (working copy) @@ -388,7 +388,7 @@ '../../src/jsregexp.h', '../../src/list-inl.h', '../../src/list.h', - '../../src/lithium-allocator.cc', + '../../src/lithium-allocator.cc', '../../src/lithium-allocator.h', '../../src/liveedit.cc', '../../src/liveedit.h', @@ -540,6 +540,10 @@ '../../src/arm/full-codegen-arm.cc', '../../src/arm/ic-arm.cc', '../../src/arm/jump-target-arm.cc', + '../../src/arm/lithium-codegen-arm.cc', + '../../src/arm/lithium-codegen-arm.h', + '../../src/arm/lithium-arm.cc', + '../../src/arm/lithium-arm.h', '../../src/arm/macro-assembler-arm.cc', '../../src/arm/macro-assembler-arm.h', '../../src/arm/regexp-macro-assembler-arm.cc', -- v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev
