< prev index next >

src/hotspot/cpu/s390/vm_version_s390.cpp

Print this page
rev 56859 : 8233787: Break cycle in vm_version* includes
Reviewed-by:

*** 29,39 **** #include "compiler/disassembler.hpp" #include "code/compiledIC.hpp" #include "memory/resourceArea.hpp" #include "runtime/java.hpp" #include "runtime/stubCodeGenerator.hpp" ! #include "vm_version_s390.hpp" # include <sys/sysinfo.h> bool VM_Version::_is_determine_features_test_running = false; const char* VM_Version::_model_string; --- 29,39 ---- #include "compiler/disassembler.hpp" #include "code/compiledIC.hpp" #include "memory/resourceArea.hpp" #include "runtime/java.hpp" #include "runtime/stubCodeGenerator.hpp" ! #include "runtime/vm_version.hpp" # include <sys/sysinfo.h> bool VM_Version::_is_determine_features_test_running = false; const char* VM_Version::_model_string;
*** 42,53 **** unsigned long VM_Version::_cipher_features[_features_buffer_len] = {0, 0, 0, 0}; unsigned long VM_Version::_msgdigest_features[_features_buffer_len] = {0, 0, 0, 0}; unsigned int VM_Version::_nfeatures = 0; unsigned int VM_Version::_ncipher_features = 0; unsigned int VM_Version::_nmsgdigest_features = 0; ! unsigned int VM_Version::_Dcache_lineSize = 256; ! unsigned int VM_Version::_Icache_lineSize = 256; static const char* z_gen[] = {" ", "G1", "G2", "G3", "G4", "G5", "G6", "G7" }; static const char* z_machine[] = {" ", "2064", "2084", "2094", "2097", "2817", " ", "2964" }; static const char* z_name[] = {" ", "z900", "z990", "z9 EC", "z10 EC", "z196 EC", "ec12", "z13" }; --- 42,53 ---- unsigned long VM_Version::_cipher_features[_features_buffer_len] = {0, 0, 0, 0}; unsigned long VM_Version::_msgdigest_features[_features_buffer_len] = {0, 0, 0, 0}; unsigned int VM_Version::_nfeatures = 0; unsigned int VM_Version::_ncipher_features = 0; unsigned int VM_Version::_nmsgdigest_features = 0; ! unsigned int VM_Version::_Dcache_lineSize = DEFAULT_CACHE_LINE_SIZE; ! unsigned int VM_Version::_Icache_lineSize = DEFAULT_CACHE_LINE_SIZE; static const char* z_gen[] = {" ", "G1", "G2", "G3", "G4", "G5", "G6", "G7" }; static const char* z_machine[] = {" ", "2064", "2084", "2094", "2097", "2817", " ", "2964" }; static const char* z_name[] = {" ", "z900", "z990", "z9 EC", "z10 EC", "z196 EC", "ec12", "z13" };
< prev index next >