8298413: [s390] CPUInfoTest fails due to uppercase feature string
Reviewed-by: mdoerr, lucy
This commit is contained in:
parent
98433a2f6e
commit
9dad874ff9
@ -1,6 +1,6 @@
|
||||
/*
|
||||
* Copyright (c) 2016, 2022, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 2022 SAP SE. All rights reserved.
|
||||
* Copyright (c) 2016, 2023, Oracle and/or its affiliates. All rights reserved.
|
||||
* Copyright (c) 2016, 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
|
||||
@ -82,8 +82,8 @@ static const char* z_features[] = {" ",
|
||||
"system-z, g5-z196, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update",
|
||||
"system-z, g6-ec12, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm",
|
||||
"system-z, g7-z13, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr",
|
||||
"system-z, g8-z14, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr, instrext2, venh1)",
|
||||
"system-z, g9-z15, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr, instrext2, venh1, instrext3, VEnh2 )"
|
||||
"system-z, g8-z14, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr, instrext2, venh1",
|
||||
"system-z, g9-z15, ldisp_fast, extimm, pcrel_load/store, cmpb, cond_load/store, interlocked_update, txm, vectorinstr, instrext2, venh1, instrext3, venh2"
|
||||
};
|
||||
|
||||
void VM_Version::initialize() {
|
||||
@ -374,7 +374,7 @@ void VM_Version::set_features_string() {
|
||||
strcpy(buf, "z/Architecture (unknown generation)");
|
||||
} else if (model_ix > 0) {
|
||||
_model_string = z_name[model_ix];
|
||||
jio_snprintf(buf, sizeof(buf), "%s, out-of-support_as_of_", z_features[model_ix], z_EOS[model_ix]);
|
||||
jio_snprintf(buf, sizeof(buf), "%s, out-of-support_as_of_%s", z_features[model_ix], z_EOS[model_ix]);
|
||||
} else if (model_ix < 0) {
|
||||
tty->print_cr("*** WARNING *** Ambiguous z/Architecture detection!");
|
||||
tty->print_cr(" oldest detected generation is %s", z_features[-model_ix]);
|
||||
|
Loading…
x
Reference in New Issue
Block a user