Mercurial > hg > truffle

changeset 280:7f9b895777f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author thurka
date Fri, 15 Aug 2008 05:55:22 +0200
parents 4852f4a82e58 (diff) f3a650d8df24 (current diff)
children 44aea0a1e099
files
diffstat 2 files changed, 3 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/make/jprt.config	Thu Aug 14 21:05:51 2008 +0200
+++ b/make/jprt.config	Fri Aug 15 05:55:22 2008 +0200
@@ -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 21:05:51 2008 +0200
+++ b/make/solaris/makefiles/sparcWorks.make	Fri Aug 15 05:55:22 2008 +0200
@@ -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