Mercurial > hg > truffle
changeset 284:92e12124e774
Merge
author | ysr |
---|---|
date | Wed, 20 Aug 2008 01:30:32 -0700 |
parents | 44aea0a1e099 (diff) 9199f248b0ee (current diff) |
children | d7bb383033d6 331eaa715e58 |
files | |
diffstat | 4 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java Thu Aug 14 17:58:35 2008 -0700 +++ b/agent/src/share/classes/sun/jvm/hotspot/tools/HeapSummary.java Wed Aug 20 01:30:32 2008 -0700 @@ -193,8 +193,12 @@ private static final double FACTOR = 1024*1024; private void printValMB(String title, long value) { - double mb = value / FACTOR; - System.out.println(alignment + title + value + " (" + mb + "MB)"); + if (value < 0) { + System.out.println(alignment + title + (value >>> 20) + " MB"); + } else { + double mb = value/FACTOR; + System.out.println(alignment + title + value + " (" + mb + "MB)"); + } } private void printValue(String title, long value) {
--- a/make/jprt.config Thu Aug 14 17:58:35 2008 -0700 +++ b/make/jprt.config Wed Aug 20 01:30:32 2008 -0700 @@ -77,9 +77,7 @@ # All jdk6 builds use SS11 compiler_name=SS11 else - # FIXUP: Change to SS12 once it has been validated. - #compiler_name=SS12 - compiler_name=SS11 + compiler_name=SS12 fi fi
--- a/make/solaris/makefiles/sparcWorks.make Thu Aug 14 17:58:35 2008 -0700 +++ b/make/solaris/makefiles/sparcWorks.make Wed Aug 20 01:30:32 2008 -0700 @@ -51,12 +51,9 @@ VALIDATED_COMPILER_REV := 5.8 VALIDATED_C_COMPILER_REV := 5.8 else - # FIXUP: Change to SS12 (5.9) once it has been validated. # Validated compiler for JDK7 is SS12 (5.9) - #VALIDATED_COMPILER_REV := 5.9 - #VALIDATED_C_COMPILER_REV := 5.9 - VALIDATED_COMPILER_REV := 5.8 - VALIDATED_C_COMPILER_REV := 5.8 + VALIDATED_COMPILER_REV := 5.9 + VALIDATED_C_COMPILER_REV := 5.9 endif # Warning messages about not using the above validated version