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

8327389: Remove use of HOTSPOT_BUILD_USER

Browse Source 
Reviewed-by: erikj, ihse
This commit is contained in:
Andrew John Hughes 2024-03-09 13:30:36 +00:00
parent 2d4c757e2e
commit 243cb098d4
5 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
make/hotspot/lib/CompileJvm.gmk
View File

@ -73,7 +73,6 @@ CFLAGS_VM_VERSION := \
$(VERSION_CFLAGS) \ $(VERSION_CFLAGS) \
-DHOTSPOT_VERSION_STRING='"$(VERSION_STRING)"' \ -DHOTSPOT_VERSION_STRING='"$(VERSION_STRING)"' \
-DDEBUG_LEVEL='"$(DEBUG_LEVEL)"' \ -DDEBUG_LEVEL='"$(DEBUG_LEVEL)"' \
-DHOTSPOT_BUILD_USER='"$(USERNAME)"' \
-DHOTSPOT_VM_DISTRO='"$(HOTSPOT_VM_DISTRO)"' \ -DHOTSPOT_VM_DISTRO='"$(HOTSPOT_VM_DISTRO)"' \
-DCPU='"$(OPENJDK_TARGET_CPU_VM_VERSION)"' \ -DCPU='"$(OPENJDK_TARGET_CPU_VM_VERSION)"' \
-DHOTSPOT_BUILD_TIME='"$(HOTSPOT_BUILD_TIME)"' \ -DHOTSPOT_BUILD_TIME='"$(HOTSPOT_BUILD_TIME)"' \

2
make/ide/eclipse/CreateWorkspace.gmk
View File

@ -280,7 +280,6 @@ define SetupEclipseWorkspaceBody
<resource project-relative-path="src/hotspot/share/runtime/abstract_vm_version.cpp"> \ <resource project-relative-path="src/hotspot/share/runtime/abstract_vm_version.cpp"> \
<entry kind="macro" name="HOTSPOT_VERSION_STRING" value="&quot;$(VERSION_STRING)&quot;"/> \ <entry kind="macro" name="HOTSPOT_VERSION_STRING" value="&quot;$(VERSION_STRING)&quot;"/> \
<entry kind="macro" name="DEBUG_LEVEL" value="&quot;$(DEBUG_LEVEL)&quot;"/> \ <entry kind="macro" name="DEBUG_LEVEL" value="&quot;$(DEBUG_LEVEL)&quot;"/> \
<entry kind="macro" name="HOTSPOT_BUILD_USER" value="&quot;$(USERNAME)&quot;"/> \
<entry kind="macro" name="HOTSPOT_VM_DISTRO" value="&quot;$(HOTSPOT_VM_DISTRO)&quot;"/> \ <entry kind="macro" name="HOTSPOT_VM_DISTRO" value="&quot;$(HOTSPOT_VM_DISTRO)&quot;"/> \
<entry kind="macro" name="CPU" value="&quot;$(OPENJDK_TARGET_CPU_VM_VERSION)&quot;"/> \ <entry kind="macro" name="CPU" value="&quot;$(OPENJDK_TARGET_CPU_VM_VERSION)&quot;"/> \
<entry kind="macro" name="HOTSPOT_BUILD_TIME" value="&quot;$(if $(HOTSPOT_BUILD_TIME),$(HOTSPOT_BUILD_TIME),$(call EpochToISO8601,$(shell $(DATE) +"%s")))&quot;"/> \ <entry kind="macro" name="HOTSPOT_BUILD_TIME" value="&quot;$(if $(HOTSPOT_BUILD_TIME),$(HOTSPOT_BUILD_TIME),$(call EpochToISO8601,$(shell $(DATE) +"%s")))&quot;"/> \
@ -288,7 +287,6 @@ define SetupEclipseWorkspaceBody
<resource project-relative-path="src/hotspot/share/runtime/arguments.cpp"> \ <resource project-relative-path="src/hotspot/share/runtime/arguments.cpp"> \
<entry kind="macro" name="HOTSPOT_VERSION_STRING" value="&quot;$(VERSION_STRING)&quot;"/> \ <entry kind="macro" name="HOTSPOT_VERSION_STRING" value="&quot;$(VERSION_STRING)&quot;"/> \
<entry kind="macro" name="DEBUG_LEVEL" value="&quot;$(DEBUG_LEVEL)&quot;"/> \ <entry kind="macro" name="DEBUG_LEVEL" value="&quot;$(DEBUG_LEVEL)&quot;"/> \
<entry kind="macro" name="HOTSPOT_BUILD_USER" value="&quot;$(USERNAME)&quot;"/> \
<entry kind="macro" name="HOTSPOT_VM_DISTRO" value="&quot;$(HOTSPOT_VM_DISTRO)&quot;"/> \ <entry kind="macro" name="HOTSPOT_VM_DISTRO" value="&quot;$(HOTSPOT_VM_DISTRO)&quot;"/> \
<entry kind="macro" name="CPU" value="&quot;$(OPENJDK_TARGET_CPU_VM_VERSION)&quot;"/> \ <entry kind="macro" name="CPU" value="&quot;$(OPENJDK_TARGET_CPU_VM_VERSION)&quot;"/> \
<entry kind="macro" name="HOTSPOT_BUILD_TIME" value="&quot;$(if $(HOTSPOT_BUILD_TIME),$(HOTSPOT_BUILD_TIME),$(call EpochToISO8601,$(shell $(DATE) +"%s")))&quot;"/> \ <entry kind="macro" name="HOTSPOT_BUILD_TIME" value="&quot;$(if $(HOTSPOT_BUILD_TIME),$(HOTSPOT_BUILD_TIME),$(call EpochToISO8601,$(shell $(DATE) +"%s")))&quot;"/> \

1
make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/BuildConfig.java
View File

@ -221,7 +221,6 @@ class BuildConfig {
Vector sysDefines = new Vector(); Vector sysDefines = new Vector();
sysDefines.add("WIN32"); sysDefines.add("WIN32");
sysDefines.add("_WINDOWS"); sysDefines.add("_WINDOWS");
sysDefines.add("HOTSPOT_BUILD_USER=\\\""+System.getProperty("user.name")+"\\\"");
sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\""); sysDefines.add("HOTSPOT_BUILD_TARGET=\\\""+get("Build")+"\\\"");
sysDefines.add("INCLUDE_JFR=1"); sysDefines.add("INCLUDE_JFR=1");
sysDefines.add("_JNI_IMPLEMENTATION_"); sysDefines.add("_JNI_IMPLEMENTATION_");

2
make/ide/visualstudio/hotspot/src/classes/build/tools/projectcreator/ProjectCreator.java
View File

@ -78,7 +78,7 @@ public class ProjectCreator {
System.err.println(" are both quoted strings."); System.err.println(" are both quoted strings.");
System.err.println(" Default includes: \".\""); System.err.println(" Default includes: \".\"");
System.err System.err
.println(" Default defines: WIN32, _WINDOWS, \"HOTSPOT_BUILD_USER=$(USERNAME)\""); .println(" Default defines: WIN32, _WINDOWS");
} }
public static void main(String[] args) { public static void main(String[] args) {

6
src/hotspot/share/runtime/abstract_vm_version.cpp
View File

@ -197,10 +197,6 @@ const char *Abstract_VM_Version::vm_platform_string() {
} }
const char* Abstract_VM_Version::internal_vm_info_string() { const char* Abstract_VM_Version::internal_vm_info_string() {
#ifndef HOTSPOT_BUILD_USER
#define HOTSPOT_BUILD_USER unknown
#endif
#ifndef HOTSPOT_BUILD_COMPILER #ifndef HOTSPOT_BUILD_COMPILER
#ifdef _MSC_VER #ifdef _MSC_VER
#if _MSC_VER == 1911 #if _MSC_VER == 1911
@ -284,7 +280,7 @@ const char* Abstract_VM_Version::internal_vm_info_string() {
#define INTERNAL_VERSION_SUFFIX VM_RELEASE ")" \ #define INTERNAL_VERSION_SUFFIX VM_RELEASE ")" \
" for " OS "-" CPU FLOAT_ARCH_STR LIBC_STR \ " for " OS "-" CPU FLOAT_ARCH_STR LIBC_STR \
" JRE (" VERSION_STRING "), built on " HOTSPOT_BUILD_TIME \ " JRE (" VERSION_STRING "), built on " HOTSPOT_BUILD_TIME \
" by " XSTR(HOTSPOT_BUILD_USER) " with " HOTSPOT_BUILD_COMPILER " with " HOTSPOT_BUILD_COMPILER
return strcmp(DEBUG_LEVEL, "release") == 0 return strcmp(DEBUG_LEVEL, "release") == 0
? VMNAME " (" INTERNAL_VERSION_SUFFIX ? VMNAME " (" INTERNAL_VERSION_SUFFIX