Mercurial > hg > truffle

comparison src/share/vm/utilities/vmError.cpp @ 6922:cae17c597196

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author coleenp
date Thu, 01 Nov 2012 11:57:53 -0400
parents a1b8cf9cf970
children bd7a7ce2e264
comparison
equal deleted inserted replaced
6915:a516debe2cee 6922:cae17c597196
451 // VM version 451 // VM version
452 st->print_cr("#"); 452 st->print_cr("#");
453 JDK_Version::current().to_string(buf, sizeof(buf)); 453 JDK_Version::current().to_string(buf, sizeof(buf));
454 const char* runtime_name = JDK_Version::runtime_name() != NULL ? 454 const char* runtime_name = JDK_Version::runtime_name() != NULL ?
455 JDK_Version::runtime_name() : ""; 455 JDK_Version::runtime_name() : "";
456 st->print_cr("# JRE version: %s (%s)", runtime_name, buf); 456 const char* runtime_version = JDK_Version::runtime_version() != NULL ?
457 JDK_Version::runtime_version() : "";
458 st->print_cr("# JRE version: %s (%s) (build %s)", runtime_name, buf, runtime_version);
457 st->print_cr("# Java VM: %s (%s %s %s %s)", 459 st->print_cr("# Java VM: %s (%s %s %s %s)",
458 Abstract_VM_Version::vm_name(), 460 Abstract_VM_Version::vm_name(),
459 Abstract_VM_Version::vm_release(), 461 Abstract_VM_Version::vm_release(),
460 Abstract_VM_Version::vm_info_string(), 462 Abstract_VM_Version::vm_info_string(),
461 Abstract_VM_Version::vm_platform_string(), 463 Abstract_VM_Version::vm_platform_string(),