changeset 27295:42f9334231a4

Merge
author dholmes
date Wed, 13 Jan 2016 03:18:06 +0100
parents f1718baeea33 c361afe846da
children d87d1df270bf
files
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/make/solaris/makefiles/sparcWorks.make	Wed Jan 13 01:45:14 2016 +0100
+++ b/make/solaris/makefiles/sparcWorks.make	Wed Jan 13 03:18:06 2016 +0100
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2016, 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
@@ -48,9 +48,9 @@
 $(shell $(CC) -V 2>&1 | sed -n 's/^.*[ ,\t]C[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p')
 
 # Pick which compiler is validated
-# Validated compiler for JDK9 is SS12.3 (5.12)
-VALIDATED_COMPILER_REVS   := 5.12
-VALIDATED_CC_COMPILER_REVS := 5.12
+# Validated compiler for JDK9 is SS12.4 (5.13)
+VALIDATED_COMPILER_REVS   := 5.13
+VALIDATED_CC_COMPILER_REVS := 5.13
 
 # Warning messages about not using the above validated versions
 ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := $(strip ${VALIDATED_COMPILER_REVS})
--- a/src/share/vm/runtime/vm_version.cpp	Wed Jan 13 01:45:14 2016 +0100
+++ b/src/share/vm/runtime/vm_version.cpp	Wed Jan 13 03:18:06 2016 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2016, 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
@@ -211,6 +211,8 @@
         #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1"
       #elif __SUNPRO_CC == 0x5120
         #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u3"
+      #elif __SUNPRO_CC == 0x5130
+        #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u4"
       #else
         #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC)
       #endif