Merge
authorlfoltan
Thu, 28 Aug 2014 13:01:44 -0400
changeset 26416 3ac5b684945a
parent 26414 623e5c91a502 (current diff)
parent 26415 582393444d19 (diff)
child 26417 c55a863f2a7f
Merge
--- a/hotspot/make/solaris/makefiles/sparcWorks.make	Thu Aug 28 15:44:02 2014 +0000
+++ b/hotspot/make/solaris/makefiles/sparcWorks.make	Thu Aug 28 13:01:44 2014 -0400
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -53,9 +53,9 @@
   VALIDATED_COMPILER_REVS   := 5.8
   VALIDATED_CC_COMPILER_REVS := 5.8
 else
-  # Validated compiler for JDK7 is SS12 update 1 + patches (5.10)
-  VALIDATED_COMPILER_REVS   := 5.10
-  VALIDATED_CC_COMPILER_REVS := 5.10
+  # Validated compiler for JDK9 is SS12.3 (5.12)
+  VALIDATED_COMPILER_REVS   := 5.12
+  VALIDATED_CC_COMPILER_REVS := 5.12
 endif
 
 # Warning messages about not using the above validated versions