Skip to content

Commit 5224520

Browse files
committed
8227631: Adjust AIX version check
Reviewed-by: clanger, goetz
1 parent 2c6a826 commit 5224520

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/hotspot/os/aix/os_aix.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4075,7 +4075,7 @@ void os::Aix::initialize_os_info() {
40754075
assert(minor > 0, "invalid OS release");
40764076
_os_version = (major << 24) | (minor << 16);
40774077
char ver_str[20] = {0};
4078-
char *name_str = "unknown OS";
4078+
const char* name_str = "unknown OS";
40794079
if (strcmp(uts.sysname, "OS400") == 0) {
40804080
// We run on AS/400 PASE. We do not support versions older than V5R4M0.
40814081
_on_pase = 1;
@@ -4086,19 +4086,19 @@ void os::Aix::initialize_os_info() {
40864086
name_str = "OS/400 (pase)";
40874087
jio_snprintf(ver_str, sizeof(ver_str), "%u.%u", major, minor);
40884088
} else if (strcmp(uts.sysname, "AIX") == 0) {
4089-
// We run on AIX. We do not support versions older than AIX 5.3.
4089+
// We run on AIX. We do not support versions older than AIX 7.1.
40904090
_on_pase = 0;
40914091
// Determine detailed AIX version: Version, Release, Modification, Fix Level.
40924092
odmWrapper::determine_os_kernel_version(&_os_version);
4093-
if (os_version_short() < 0x0503) {
4094-
trcVerbose("AIX release older than AIX 5.3 not supported.");
4093+
if (os_version_short() < 0x0701) {
4094+
trcVerbose("AIX releases older than AIX 7.1 are not supported.");
40954095
assert(false, "AIX release too old.");
40964096
}
40974097
name_str = "AIX";
40984098
jio_snprintf(ver_str, sizeof(ver_str), "%u.%u.%u.%u",
40994099
major, minor, (_os_version >> 8) & 0xFF, _os_version & 0xFF);
41004100
} else {
4101-
assert(false, name_str);
4101+
assert(false, "%s", name_str);
41024102
}
41034103
trcVerbose("We run on %s %s", name_str, ver_str);
41044104
}

0 commit comments

Comments
 (0)