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

6657100: Rename sparcWorks to solstudio in HotSpot

Browse Source 
Reviewed-by: erikj, dcubed
This commit is contained in:
Magnus Ihse Bursie 2018-08-31 09:37:03 +02:00
parent 45fb620218
commit 8cc7ce2c18
8 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
make/autoconf/toolchain.m4
View File

@ -1026,8 +1026,6 @@ AC_DEFUN_ONCE([TOOLCHAIN_MISC_CHECKS],
HOTSPOT_TOOLCHAIN_TYPE=$TOOLCHAIN_TYPE
if test "x$TOOLCHAIN_TYPE" = xclang; then
HOTSPOT_TOOLCHAIN_TYPE=gcc
elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
HOTSPOT_TOOLCHAIN_TYPE=sparcWorks
elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
HOTSPOT_TOOLCHAIN_TYPE=visCPP
fi

10
make/nb_native/nbproject/configurations.xml
View File

@ -2853,7 +2853,7 @@
<in>globalDefinitions.cpp</in>
<in>globalDefinitions.hpp</in>
<in>globalDefinitions_gcc.hpp</in>
<in>globalDefinitions_sparcWorks.hpp</in>
<in>globalDefinitions_solstudio.hpp</in>
<in>globalDefinitions_visCPP.hpp</in>
<in>globalDefinitions_xlc.hpp</in>
<in>growableArray.cpp</in>
@ -15217,7 +15217,7 @@
tool="3"
flavor2="0">
</item>
<item path="../../src/hotspot/share/utilities/globalDefinitions_sparcWorks.hpp"
<item path="../../src/hotspot/share/utilities/globalDefinitions_solstudio.hpp"
ex="false"
tool="3"
flavor2="0">
@ -15869,7 +15869,7 @@
<Elem>SPARC_WORKS</Elem>
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
<Elem>TARGET_ARCH_x86</Elem>
<Elem>TARGET_COMPILER_sparcWorks</Elem>
<Elem>TARGET_COMPILER_solstudio</Elem>
<Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
<Elem>TARGET_OS_ARCH_solaris_x86</Elem>
<Elem>TARGET_OS_FAMILY_solaris</Elem>
@ -15922,7 +15922,7 @@
<Elem>SPARC_WORKS</Elem>
<Elem>TARGET_ARCH_MODEL_x86_64</Elem>
<Elem>TARGET_ARCH_x86</Elem>
<Elem>TARGET_COMPILER_sparcWorks</Elem>
<Elem>TARGET_COMPILER_solstudio</Elem>
<Elem>TARGET_OS_ARCH_MODEL_solaris_x86_64</Elem>
<Elem>TARGET_OS_ARCH_solaris_x86</Elem>
<Elem>TARGET_OS_FAMILY_solaris</Elem>
@ -28989,7 +28989,7 @@
tool="3"
flavor2="0">
</item>
<item path="../../src/hotspot/share/utilities/globalDefinitions_sparcWorks.hpp"
<item path="../../src/hotspot/share/utilities/globalDefinitions_solstudio.hpp"
ex="false"
tool="3"
flavor2="0">

2
src/hotspot/share/interpreter/bytecodeHistogram.hpp
View File

@ -74,7 +74,7 @@ class BytecodeHistogram: AllStatic {
// A bytecode pair is any sequence of two consequtive bytecodes.
class BytecodePairHistogram: AllStatic {
public: // for SparcWorks
public: // for solstudio
enum Constants {
log2_number_of_codes = 8, // use a power of 2 for faster addressing
number_of_codes = 1 << log2_number_of_codes, // must be no less than Bytecodes::number_of_codes

2
src/hotspot/share/runtime/vmStructs.hpp
View File

@ -72,7 +72,7 @@ typedef struct {
int32_t isStatic; // Indicates whether following field is an offset or an address
uint64_t offset; // Offset of field within structure; only used for nonstatic fields
void* address; // Address of field; only used for static fields
// ("offset" can not be reused because of apparent SparcWorks compiler bug
// ("offset" can not be reused because of apparent solstudio compiler bug
// in generation of initializer data)
} VMStructEntry;

2
src/hotspot/share/utilities/count_trailing_zeros.hpp
View File

@ -89,7 +89,7 @@ inline unsigned count_trailing_zeros(uintx x) {
/*****************************************************************************
* Oracle Studio
*****************************************************************************/
#elif defined(TARGET_COMPILER_sparcWorks)
#elif defined(TARGET_COMPILER_solstudio)
// No compiler built-in / intrinsic, so use inline assembler.

6
src/hotspot/share/utilities/globalDefinitions_sparcWorks.hpp → src/hotspot/share/utilities/globalDefinitions_solstudio.hpp
View File

@ -22,8 +22,8 @@
*
*/
#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SPARCWORKS_HPP
#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SPARCWORKS_HPP
#ifndef SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP
#define SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP
#include "jni.h"
@ -261,4 +261,4 @@ inline int wcslen(const jchar* x) { return wcslen((const wchar_t*)x); }
// Alignment
#define ATTRIBUTE_ALIGNED(x) __attribute__((aligned(x)))
#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SPARCWORKS_HPP
#endif // SHARE_VM_UTILITIES_GLOBALDEFINITIONS_SOLSTUDIO_HPP

2
src/java.base/solaris/native/libjvm_db/libjvm_db.c
View File

@ -85,7 +85,7 @@ typedef struct VMStructEntry {
const char * typeName; /* The type name containing the given field (example: "Klass") */
const char * fieldName; /* The field name within the type (example: "_name") */
uint64_t address; /* Address of field; only used for static fields */
/* ("offset" can not be reused because of apparent SparcWorks compiler bug */
/* ("offset" can not be reused because of apparent solstudio compiler bug */
/* in generation of initializer data) */
} VMStructEntry;

4
src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/types/basic/BasicTypeDataBase.java
View File

@ -197,11 +197,11 @@ public class BasicTypeDataBase implements TypeDataBase {
// pattern of, for example, a double and the vtbl is vanishingly
// small.)
// 1. The first word of the object (should handle MSVC++ as
// well as the SparcWorks compilers with compatibility set to
// well as the solstudio compilers with compatibility set to
// v5.0 or greater)
// 2. and 3. The last two Address-aligned words of the part of
// the object defined by its topmost polymorphic superclass.
// This should handle the SparcWorks compilers, v4.2 or
// This should handle the solstudio compilers, v4.2 or
// earlier, as well as any other compilers which place the vptr
// at the end of the user-defined fields of the first base
// class with virtual functions.