Mercurial > hg > icedtea9-forest > hotspot
changeset 3596:bcd1b9d98558
Merge
| author | jiangli |
|---|---|
| date | Thu, 26 Jul 2012 16:55:42 -0700 |
| parents | 43541217e9f7 (diff) a93a6d2c9e6c (current diff) |
| children | 72e0362c3f0c 3080f4743cf2 |
| files | |
| diffstat | 5 files changed, 17 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/solaris/makefiles/fastdebug.make Tue Jul 24 13:16:26 2012 -0400 +++ b/make/solaris/makefiles/fastdebug.make Thu Jul 26 16:55:42 2012 -0700 @@ -36,6 +36,11 @@ ifeq ("${Platform_compiler}", "sparcWorks") OPT_CFLAGS/SLOWER = -xO2 +ifeq ($(COMPILER_REV_NUMERIC), 510) +# CC 5.10 has bug XXXXX with -xO4 +OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/SLOWER) +endif # COMPILER_REV_NUMERIC == 510 + ifeq ($(COMPILER_REV_NUMERIC), 509) # To avoid jvm98 crash OPT_CFLAGS/instanceKlass.o = $(OPT_CFLAGS/SLOWER)
--- a/make/solaris/makefiles/optimized.make Tue Jul 24 13:16:26 2012 -0400 +++ b/make/solaris/makefiles/optimized.make Thu Jul 26 16:55:42 2012 -0700 @@ -32,6 +32,11 @@ # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) ifeq ("${Platform_compiler}", "sparcWorks") +ifeq ($(COMPILER_REV_NUMERIC), 510) +# CC 5.10 has bug XXXXX with -xO4 +OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/O2) +endif # COMPILER_REV_NUMERIC == 510 + ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) # dtrace cannot handle tail call optimization (6672627, 6693876) OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
--- a/make/solaris/makefiles/product.make Tue Jul 24 13:16:26 2012 -0400 +++ b/make/solaris/makefiles/product.make Thu Jul 26 16:55:42 2012 -0700 @@ -40,6 +40,11 @@ # (OPT_CFLAGS/SLOWER is also available, to alter compilation of buggy files) ifeq ("${Platform_compiler}", "sparcWorks") +ifeq ($(COMPILER_REV_NUMERIC), 510) +# CC 5.10 has bug XXXXX with -xO4 +OPT_CFLAGS/jvmtiClassFileReconstituter.o = $(OPT_CFLAGS/O2) +endif # COMPILER_REV_NUMERIC == 510 + ifeq ($(shell expr $(COMPILER_REV_NUMERIC) \>= 509), 1) # dtrace cannot handle tail call optimization (6672627, 6693876) OPT_CFLAGS/jni.o = $(OPT_CFLAGS/DEFAULT) $(OPT_CCFLAGS/NO_TAIL_CALL_OPT)
--- a/test/runtime/7020373/Test7020373.sh Tue Jul 24 13:16:26 2012 -0400 +++ b/test/runtime/7020373/Test7020373.sh Thu Jul 26 16:55:42 2012 -0700 @@ -2,9 +2,10 @@ ## ## @test -## @bug 7020373 7055247 7053586 +## @bug 7020373 7055247 7053586 7185550 ## @key cte_test ## @summary JSR rewriting can overflow memory address size variables +## @ignore Ignore it as 7053586 test uses lots of memory. See bug report for detail. ## @run shell Test7020373.sh ##