Skip to content

Commit 8c4f2ff

Browse files
snake66chhagedorn
authored andcommitted
8356182: Build fails on aarch64 without ZGC
This work was sponsored by The FreeBSD Foundation Reviewed-by: stefank, chagedorn
1 parent def907a commit 8c4f2ff

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

src/hotspot/cpu/aarch64/jvmciCodeInstaller_aarch64.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -180,6 +180,7 @@ bool CodeInstaller::pd_relocate(address pc, jint mark) {
180180
case POLL_RETURN_FAR:
181181
_instructions->relocate(pc, relocInfo::poll_return_type);
182182
return true;
183+
#if INCLUDE_ZGC
183184
case Z_BARRIER_RELOCATION_FORMAT_LOAD_GOOD_BEFORE_TB_X:
184185
_instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatLoadGoodBeforeTbX);
185186
return true;
@@ -192,6 +193,7 @@ bool CodeInstaller::pd_relocate(address pc, jint mark) {
192193
case Z_BARRIER_RELOCATION_FORMAT_STORE_BAD_BEFORE_MOV:
193194
_instructions->relocate(pc, barrier_Relocation::spec(), ZBarrierRelocationFormatStoreBadBeforeMov);
194195
return true;
196+
#endif
195197

196198
}
197199
return false;

0 commit comments

Comments
 (0)