Commit 54f9f0a2 authored by Eric Holk's avatar Eric Holk Committed by Commit Bot

[arm] Fix build from Mac

R= ahaas@chromium.org

Also-By: ahaas@chromium.org
Cq-Include-Trybots: luci.chromium.try:linux_chromium_rel_ng;luci.v8.try:v8_linux_noi18n_rel_ng
Change-Id: I8e34bb93df0cb7174e6c2fc2c36fe8697f4f88c4
Reviewed-on: https://chromium-review.googlesource.com/1073608Reviewed-by: 's avatarEric Holk <eholk@chromium.org>
Reviewed-by: 's avatarAndreas Haas <ahaas@chromium.org>
Commit-Queue: Eric Holk <eholk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#53371}
parent e48d9788
......@@ -386,7 +386,7 @@ void Assembler::set_target_address_at(Address pc, Address constant_pool,
IsOrrImmed(Memory::int32_at(pc + 2 * kInstrSize)) &&
IsOrrImmed(Memory::int32_at(pc + 3 * kInstrSize)));
uint32_t* instr_ptr = reinterpret_cast<uint32_t*>(pc);
uint32_t immediate = reinterpret_cast<uint32_t>(target);
uint32_t immediate = static_cast<uint32_t>(target);
instr_ptr[0] = PatchShiftImm(instr_ptr[0], immediate & kImm8Mask);
instr_ptr[1] = PatchShiftImm(instr_ptr[1], immediate & (kImm8Mask << 8));
instr_ptr[2] = PatchShiftImm(instr_ptr[2], immediate & (kImm8Mask << 16));
......
......@@ -343,7 +343,7 @@ Address RelocInfo::embedded_address() const {
}
uint32_t RelocInfo::embedded_size() const {
return reinterpret_cast<uint32_t>(
return static_cast<uint32_t>(
Assembler::target_address_at(pc_, constant_pool_));
}
......@@ -354,7 +354,7 @@ void RelocInfo::set_embedded_address(Address address,
void RelocInfo::set_embedded_size(uint32_t size, ICacheFlushMode flush_mode) {
Assembler::set_target_address_at(pc_, constant_pool_,
reinterpret_cast<Address>(size), flush_mode);
static_cast<Address>(size), flush_mode);
}
void RelocInfo::set_js_to_wasm_address(Address address,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment