changeset 9080:fc5ffcba674b

Merge
author clanger
date Mon, 01 Apr 2019 14:31:23 +0200
parents 71aba4a921a0 96fec237fcc0
children 0cbfe6c38b2e
files .hgtags
diffstat 14 files changed, 51 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Jan 31 23:56:37 2019 +0800
+++ b/.hgtags	Mon Apr 01 14:31:23 2019 +0200
@@ -1258,3 +1258,4 @@
 9ce27f0a4683a2083d3aed59a40d6a3ccfc8e397 jdk8u212-b00
 5af8ec63c21c861106d6bf8b137620ae4d3664be jdk8u222-b00
 9ee244aee077ffad50d1b183a61d9f5fc39a1285 jdk8u212-b01
+2d94aac71d3337c7c3284bdb101b7ea15ef6d5f5 jdk8u212-b02
--- a/make/aix/makefiles/buildtree.make	Thu Jan 31 23:56:37 2019 +0800
+++ b/make/aix/makefiles/buildtree.make	Mon Apr 01 14:31:23 2019 +0200
@@ -1,6 +1,7 @@
 #
 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. All rights reserved.
+# Copyright 2019 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -215,6 +216,10 @@
 	echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
 	echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
 	echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
+	echo "VENDOR = $(COMPANY_NAME)"; \
+	echo "VENDOR_URL = $(VENDOR_URL)"; \
+	echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \
+	echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \
 	echo "OPENJDK = $(OPENJDK)"; \
 	echo "$(LP64_SETTING/$(DATA_MODE))"; \
 	echo; \
--- a/make/aix/makefiles/vm.make	Thu Jan 31 23:56:37 2019 +0800
+++ b/make/aix/makefiles/vm.make	Mon Apr 01 14:31:23 2019 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved.
 # Copyright 2012, 2013 SAP AG. All rights reserved.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
@@ -101,7 +101,8 @@
 # This is VERY important! The version define must only be supplied to vm_version.o
 # If not, ccache will not re-use the cache at all, since the version string might contain
 # a time and date.
-CXXFLAGS/vm_version.o += ${JRE_VERSION}
+CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS}
+CXXFLAGS/arguments.o += ${VERSION_CFLAGS}
 
 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
 
--- a/make/bsd/makefiles/buildtree.make	Thu Jan 31 23:56:37 2019 +0800
+++ b/make/bsd/makefiles/buildtree.make	Mon Apr 01 14:31:23 2019 +0200
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2019 Red Hat Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -221,6 +222,10 @@
 	echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
 	echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
 	echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
+	echo "VENDOR = $(COMPANY_NAME)"; \
+	echo "VENDOR_URL = $(VENDOR_URL)"; \
+	echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \
+	echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \
 	echo "OPENJDK = $(OPENJDK)"; \
 	echo "$(LP64_SETTING/$(DATA_MODE))"; \
 	echo; \
--- a/make/bsd/makefiles/vm.make	Thu Jan 31 23:56:37 2019 +0800
+++ b/make/bsd/makefiles/vm.make	Mon Apr 01 14:31:23 2019 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2019, 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
@@ -100,7 +100,8 @@
 # This is VERY important! The version define must only be supplied to vm_version.o
 # If not, ccache will not re-use the cache at all, since the version string might contain
 # a time and date.
-CXXFLAGS/vm_version.o += ${JRE_VERSION}
+CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS}
+CXXFLAGS/arguments.o += ${VERSION_CFLAGS}
 
 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
 
--- a/make/linux/makefiles/buildtree.make	Thu Jan 31 23:56:37 2019 +0800
+++ b/make/linux/makefiles/buildtree.make	Mon Apr 01 14:31:23 2019 +0200
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2019 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -220,6 +221,10 @@
 	echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
 	echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
 	echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
+	echo "VENDOR = $(COMPANY_NAME)"; \
+	echo "VENDOR_URL = $(VENDOR_URL)"; \
+	echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \
+	echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \
 	echo "OPENJDK = $(OPENJDK)"; \
 	echo "$(LP64_SETTING/$(DATA_MODE))"; \
 	echo; \
--- a/make/linux/makefiles/vm.make	Thu Jan 31 23:56:37 2019 +0800
+++ b/make/linux/makefiles/vm.make	Mon Apr 01 14:31:23 2019 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1999, 2019, 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
@@ -102,7 +102,8 @@
 # This is VERY important! The version define must only be supplied to vm_version.o
 # If not, ccache will not re-use the cache at all, since the version string might contain
 # a time and date.
-CXXFLAGS/vm_version.o += ${JRE_VERSION}
+CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS}
+CXXFLAGS/arguments.o += ${VERSION_CFLAGS}
 
 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
 
--- a/make/openjdk_distro	Thu Jan 31 23:56:37 2019 +0800
+++ b/make/openjdk_distro	Mon Apr 01 14:31:23 2019 +0200
@@ -1,5 +1,6 @@
 # 
 # Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2019 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -28,5 +29,4 @@
 
 # Don't put quotes (fail windows build).
 HOTSPOT_VM_DISTRO=OpenJDK
-COMPANY_NAME=
 PRODUCT_NAME=OpenJDK
--- a/make/solaris/makefiles/buildtree.make	Thu Jan 31 23:56:37 2019 +0800
+++ b/make/solaris/makefiles/buildtree.make	Mon Apr 01 14:31:23 2019 +0200
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2019 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -208,6 +209,10 @@
 	echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \
 	echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \
 	echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \
+	echo "VENDOR = $(COMPANY_NAME)"; \
+	echo "VENDOR_URL = $(VENDOR_URL)"; \
+	echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \
+	echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \
 	echo "OPENJDK = $(OPENJDK)"; \
 	echo "$(LP64_SETTING/$(DATA_MODE))"; \
 	echo; \
--- a/make/solaris/makefiles/vm.make	Thu Jan 31 23:56:37 2019 +0800
+++ b/make/solaris/makefiles/vm.make	Mon Apr 01 14:31:23 2019 +0200
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 1998, 2019, 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
@@ -88,7 +88,8 @@
 # This is VERY important! The version define must only be supplied to vm_version.o
 # If not, ccache will not re-use the cache at all, since the version string might contain
 # a time and date.
-CXXFLAGS/vm_version.o += ${JRE_VERSION}
+CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS}
+CXXFLAGS/arguments.o += ${VERSION_CFLAGS}
 
 CXXFLAGS/BYFILE = $(CXXFLAGS/$@)
 
--- a/make/windows/build.make	Thu Jan 31 23:56:37 2019 +0800
+++ b/make/windows/build.make	Mon Apr 01 14:31:23 2019 +0200
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2019 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -279,6 +280,10 @@
 	@ echo HS_COMPANY=$(COMPANY_NAME)			>> $@
 	@ echo HS_FILEDESC=$(HS_FILEDESC)			>> $@
 	@ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO)		>> $@
+	@ echo VENDOR=$(VENDOR)					>> $@
+	@ echo VENDOR_URL=$(VENDOR_URL)				>> $@
+	@ echo VENDOR_URL_BUG=$(VENDOR_URL_BUG)			>> $@
+	@ echo VENDOR_URL_VM_BUG=$(VENDOR_URL_VM_BUG)		>> $@
 	@ if "$(OPENJDK)" NEQ "" echo OPENJDK=$(OPENJDK)	>> $@
 	@ echo HS_COPYRIGHT=$(HOTSPOT_VM_COPYRIGHT)		>> $@
 	@ echo HS_NAME=$(PRODUCT_NAME) $(JDK_MKTG_VERSION)	>> $@
--- a/make/windows/makefiles/vm.make	Thu Jan 31 23:56:37 2019 +0800
+++ b/make/windows/makefiles/vm.make	Mon Apr 01 14:31:23 2019 +0200
@@ -1,5 +1,6 @@
 #
 # Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright 2019 Red Hat, Inc.
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 #
 # This code is free software; you can redistribute it and/or modify it
@@ -61,6 +62,10 @@
 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\""
 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\""
 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\""
+CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR=\"$(COMPANY_NAME)\""
+CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL=\"$(VENDOR_URL)\""
+CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL_BUG=\"$(VENDOR_URL_BUG)\""
+CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL_VM_BUG=\"$(VENDOR_URL_VM_BUG)\""
 
 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS)
 
--- a/src/share/vm/runtime/arguments.cpp	Thu Jan 31 23:56:37 2019 +0800
+++ b/src/share/vm/runtime/arguments.cpp	Mon Apr 01 14:31:23 2019 +0200
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1997, 2019, 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
@@ -66,7 +66,11 @@
 #endif // INCLUDE_ALL_GCS
 
 // Note: This is a special bug reporting site for the JVM
-#define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp"
+#ifdef VENDOR_URL_VM_BUG
+# define DEFAULT_VENDOR_URL_BUG VENDOR_URL_VM_BUG
+#else
+# define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp"
+#endif
 #define DEFAULT_JAVA_LAUNCHER  "generic"
 
 // Disable options not supported in this release, with a warning if they
--- a/src/share/vm/runtime/vm_version.cpp	Thu Jan 31 23:56:37 2019 +0800
+++ b/src/share/vm/runtime/vm_version.cpp	Mon Apr 01 14:31:23 2019 +0200
@@ -140,7 +140,7 @@
 
 const char* Abstract_VM_Version::vm_vendor() {
 #ifdef VENDOR
-  return XSTR(VENDOR);
+  return VENDOR;
 #else
   return JDK_Version::is_gte_jdk17x_version() ?
     "Oracle Corporation" : "Sun Microsystems Inc.";