stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8146855: Update hotspot sources to recognize Solaris Studio 12u4 compiler

Browse Source 
Reviewed-by: dcubed, gthornbr
This commit is contained in:
David Holmes 2016-01-12 19:48:00 -05:00
parent 93fe673dad
commit 93ca986bae
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hotspot/make/solaris/makefiles/sparcWorks.make
View File

@ -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. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
# #
# This code is free software; you can redistribute it and/or modify it # This code is free software; you can redistribute it and/or modify it
@ -48,9 +48,9 @@ CC_COMPILER_REV := \
$(shell $(CC) -V 2>&1 | sed -n 's/^.*[ ,\t]C[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p') $(shell $(CC) -V 2>&1 | sed -n 's/^.*[ ,\t]C[ ,\t]\([1-9]\.[0-9][0-9]*\).*/\1/p')
# Pick which compiler is validated # Pick which compiler is validated
# Validated compiler for JDK9 is SS12.3 (5.12) # Validated compiler for JDK9 is SS12.4 (5.13)
VALIDATED_COMPILER_REVS := 5.12 VALIDATED_COMPILER_REVS := 5.13
VALIDATED_CC_COMPILER_REVS := 5.12 VALIDATED_CC_COMPILER_REVS := 5.13
# Warning messages about not using the above validated versions # Warning messages about not using the above validated versions
ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := $(strip ${VALIDATED_COMPILER_REVS}) ENFORCE_COMPILER_REV${ENFORCE_COMPILER_REV} := $(strip ${VALIDATED_COMPILER_REVS})

4
hotspot/src/share/vm/runtime/vm_version.cpp
View File

@ -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. * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* *
* This code is free software; you can redistribute it and/or modify it * This code is free software; you can redistribute it and/or modify it
@ -211,6 +211,8 @@ const char* Abstract_VM_Version::internal_vm_info_string() {
#define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1" #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u1"
#elif __SUNPRO_CC == 0x5120 #elif __SUNPRO_CC == 0x5120
#define HOTSPOT_BUILD_COMPILER "Sun Studio 12u3" #define HOTSPOT_BUILD_COMPILER "Sun Studio 12u3"
#elif __SUNPRO_CC == 0x5130
#define HOTSPOT_BUILD_COMPILER "Sun Studio 12u4"
#else #else
#define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC) #define HOTSPOT_BUILD_COMPILER "unknown Workshop:" XSTR(__SUNPRO_CC)
#endif #endif