Mercurial > hg > release > icedtea7-forest-2.3 > hotspot

changeset 3748:84b9ad961553

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Changes for HSX23
author chrisphi
date Fri, 12 Jul 2013 22:18:15 +0100
parents 920cd25ec34c
children 4e032c676dc8
files src/cpu/zero/vm/asm_helper.cpp src/share/vm/utilities/vmError.cpp src/share/vm/utilities/vmError.hpp
diffstat 3 files changed, 4 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/zero/vm/asm_helper.cpp	Tue May 28 19:43:58 2013 +0200
+++ b/src/cpu/zero/vm/asm_helper.cpp	Fri Jul 12 22:18:15 2013 +0100
@@ -590,7 +590,7 @@
   nl();
   print_def("JNIHANDLEBLOCK_TOP", offset_of(JNIHandleBlock, _top));
   nl();
-  print_def("KLASS_PART", klassOopDesc::klass_part_offset_in_bytes());
+  print_def("KLASS_PART", sizeof(klassOopDesc));
   print_def("KLASS_ACCESSFLAGS", offset_of(Klass, _access_flags));
   print_def("KLASS_JAVA_MIRROR", offset_of(Klass, _java_mirror));
   print_def("INSTANCEKLASS_INITSTATE", offset_of(instanceKlass, _init_state));
--- a/src/share/vm/utilities/vmError.cpp	Tue May 28 19:43:58 2013 +0200
+++ b/src/share/vm/utilities/vmError.cpp	Fri Jul 12 22:18:15 2013 +0100
@@ -255,7 +255,7 @@
 }
 
 #ifdef PRODUCT
-extern "C" void ps() {
+extern "C" void _ps() {
   fdStream out(defaultStream::output_fd());
   JavaThread* thread = JavaThread::active();
   char *buf = new char[1024*1024];
--- a/src/share/vm/utilities/vmError.hpp	Tue May 28 19:43:58 2013 +0200
+++ b/src/share/vm/utilities/vmError.hpp	Fri Jul 12 22:18:15 2013 +0100
@@ -31,7 +31,7 @@
 class VM_ReportJavaOutOfMemory;
 
 #ifdef PRODUCT
-extern "C" void ps();
+extern "C" void _ps();
 #endif // PRODUCT
 
 class VMError : public StackObj {
@@ -103,7 +103,7 @@
   bool should_report_bug(unsigned int id) { return id != oom_error; }
 
 #ifdef PRODUCT
-  friend void ps();
+  friend void _ps();
 #endif // PRODUCT
 
 public: