Skip to content
This repository has been archived by the owner on Sep 19, 2023. It is now read-only.
/ jdk20u Public archive

Commit

Permalink
8307104: [AIX] VM crashes with UseRTMLocking on Power10
Browse files Browse the repository at this point in the history
Reviewed-by: clanger, lucy
  • Loading branch information
backwaterred committed May 11, 2023
1 parent 6485fca commit 005674f
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions src/hotspot/cpu/ppc/vm_version_ppc.cpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*
* Copyright (c) 1997, 2022, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2020 SAP SE. All rights reserved.
* Copyright (c) 1997, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2012, 2023 SAP SE. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
Expand Down Expand Up @@ -380,7 +380,7 @@ void VM_Version::initialize() {
// Adjust RTM (Restricted Transactional Memory) flags.
if (UseRTMLocking) {
// If CPU or OS do not support RTM:
if (PowerArchitecturePPC64 < 8) {
if (PowerArchitecturePPC64 < 8 || PowerArchitecturePPC64 > 9) {
vm_exit_during_initialization("RTM instructions are not available on this CPU.");
}

Expand Down Expand Up @@ -673,7 +673,7 @@ void VM_Version::determine_features() {
// We don't want to change this property, as user code might depend on it.
// So the tests can not check on subversion 3.30, and we only enable RTM
// with AIX 7.2.
if (has_lqarx()) { // POWER8 or above
if (has_lqarx() && !has_brw()) { // POWER8 or POWER9
if (os::Aix::os_version() >= 0x07020000) { // At least AIX 7.2.
_features |= rtm_m;
}
Expand Down

0 comments on commit 005674f

Please sign in to comment.