Skip to content
Permalink
Browse files
8239514: Build for arm-linux-gnueabihf fails with undefined reference…
… read_polling_page

Reviewed-by: dsamersoff, dholmes
  • Loading branch information
Boris Ulasevich committed Mar 7, 2020
1 parent ff8e7d4 commit d0e44e5bb453d0a488ee3f69eab42b05d194c6a2
Showing with 7 additions and 6 deletions.
  1. +6 −4 src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp
  2. +1 −2 src/hotspot/cpu/arm/macroAssembler_arm.cpp
@@ -291,11 +291,13 @@ void LIR_Assembler::return_op(LIR_Opr result) {
}

int LIR_Assembler::safepoint_poll(LIR_Opr tmp, CodeEmitInfo* info) {
if (info != NULL) {
add_debug_info_for_branch(info);
}

int offset = __ offset();
__ read_polling_page(Rtemp, relocInfo::poll_type);
__ get_polling_page(Rtemp);
__ relocate(relocInfo::poll_type);
add_debug_info_for_branch(info); // help pc_desc_at to find correct scope for current PC
__ ldr(Rtemp, Address(Rtemp));

return offset;
}

@@ -2054,6 +2054,7 @@ void MacroAssembler::fast_unlock(Register Roop, Register Rbox, Register Rscratch
bind(done);

}
#endif // COMPILER2

void MacroAssembler::safepoint_poll(Register tmp1, Label& slow_path) {
if (SafepointMechanism::uses_thread_local_poll()) {
@@ -2081,5 +2082,3 @@ void MacroAssembler::read_polling_page(Register dest, relocInfo::relocType rtype
ldr(dest, Address(dest));
}


#endif // COMPILER2

0 comments on commit d0e44e5

Please sign in to comment.