# HG changeset patch # User mbaesken # Date 1563268238 -7200 # Node ID 443f7359b34d60e7821216ffc60f88b6ffe0ccdd # Parent a07fedf3db62269969ed9e505eedd71895972fd6 8227631: Adjust AIX version check Reviewed-by: clanger, goetz diff -r a07fedf3db62 -r 443f7359b34d src/hotspot/os/aix/os_aix.cpp --- a/src/hotspot/os/aix/os_aix.cpp Wed Jul 17 10:11:05 2019 +0800 +++ b/src/hotspot/os/aix/os_aix.cpp Tue Jul 16 11:10:38 2019 +0200 @@ -4075,7 +4075,7 @@ assert(minor > 0, "invalid OS release"); _os_version = (major << 24) | (minor << 16); char ver_str[20] = {0}; - char *name_str = "unknown OS"; + const char* name_str = "unknown OS"; if (strcmp(uts.sysname, "OS400") == 0) { // We run on AS/400 PASE. We do not support versions older than V5R4M0. _on_pase = 1; @@ -4086,19 +4086,19 @@ name_str = "OS/400 (pase)"; jio_snprintf(ver_str, sizeof(ver_str), "%u.%u", major, minor); } else if (strcmp(uts.sysname, "AIX") == 0) { - // We run on AIX. We do not support versions older than AIX 5.3. + // We run on AIX. We do not support versions older than AIX 7.1. _on_pase = 0; // Determine detailed AIX version: Version, Release, Modification, Fix Level. odmWrapper::determine_os_kernel_version(&_os_version); - if (os_version_short() < 0x0503) { - trcVerbose("AIX release older than AIX 5.3 not supported."); + if (os_version_short() < 0x0701) { + trcVerbose("AIX releases older than AIX 7.1 are not supported."); assert(false, "AIX release too old."); } name_str = "AIX"; jio_snprintf(ver_str, sizeof(ver_str), "%u.%u.%u.%u", major, minor, (_os_version >> 8) & 0xFF, _os_version & 0xFF); } else { - assert(false, name_str); + assert(false, "%s", name_str); } trcVerbose("We run on %s %s", name_str, ver_str); }