Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
Merge
Mon, 01 Apr 2019 14:31:23 +0200
- author
- clanger
- date
- Mon, 01 Apr 2019 14:31:23 +0200
- changeset 9658
- fc5ffcba674b
- parent 9657
- 71aba4a921a0
- parent 9636
- 96fec237fcc0
- child 9659
- 0cbfe6c38b2e
Merge
| .hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Thu Jan 31 23:56:37 2019 +0800 1.2 +++ b/.hgtags Mon Apr 01 14:31:23 2019 +0200 1.3 @@ -1258,3 +1258,4 @@ 1.4 9ce27f0a4683a2083d3aed59a40d6a3ccfc8e397 jdk8u212-b00 1.5 5af8ec63c21c861106d6bf8b137620ae4d3664be jdk8u222-b00 1.6 9ee244aee077ffad50d1b183a61d9f5fc39a1285 jdk8u212-b01 1.7 +2d94aac71d3337c7c3284bdb101b7ea15ef6d5f5 jdk8u212-b02
2.1 --- a/make/aix/makefiles/buildtree.make Thu Jan 31 23:56:37 2019 +0800 2.2 +++ b/make/aix/makefiles/buildtree.make Mon Apr 01 14:31:23 2019 +0200 2.3 @@ -1,6 +1,7 @@ 2.4 # 2.5 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 2.6 # Copyright 2012, 2013 SAP AG. All rights reserved. 2.7 +# Copyright 2019 Red Hat, Inc. 2.8 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.9 # 2.10 # This code is free software; you can redistribute it and/or modify it 2.11 @@ -215,6 +216,10 @@ 2.12 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 2.13 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 2.14 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 2.15 + echo "VENDOR = $(COMPANY_NAME)"; \ 2.16 + echo "VENDOR_URL = $(VENDOR_URL)"; \ 2.17 + echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \ 2.18 + echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \ 2.19 echo "OPENJDK = $(OPENJDK)"; \ 2.20 echo "$(LP64_SETTING/$(DATA_MODE))"; \ 2.21 echo; \
3.1 --- a/make/aix/makefiles/vm.make Thu Jan 31 23:56:37 2019 +0800 3.2 +++ b/make/aix/makefiles/vm.make Mon Apr 01 14:31:23 2019 +0200 3.3 @@ -1,5 +1,5 @@ 3.4 # 3.5 -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 3.6 +# Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. 3.7 # Copyright 2012, 2013 SAP AG. All rights reserved. 3.8 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.9 # 3.10 @@ -101,7 +101,8 @@ 3.11 # This is VERY important! The version define must only be supplied to vm_version.o 3.12 # If not, ccache will not re-use the cache at all, since the version string might contain 3.13 # a time and date. 3.14 -CXXFLAGS/vm_version.o += ${JRE_VERSION} 3.15 +CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS} 3.16 +CXXFLAGS/arguments.o += ${VERSION_CFLAGS} 3.17 3.18 CXXFLAGS/BYFILE = $(CXXFLAGS/$@) 3.19
4.1 --- a/make/bsd/makefiles/buildtree.make Thu Jan 31 23:56:37 2019 +0800 4.2 +++ b/make/bsd/makefiles/buildtree.make Mon Apr 01 14:31:23 2019 +0200 4.3 @@ -1,5 +1,6 @@ 4.4 # 4.5 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 4.6 +# Copyright 2019 Red Hat Inc. 4.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 4.8 # 4.9 # This code is free software; you can redistribute it and/or modify it 4.10 @@ -221,6 +222,10 @@ 4.11 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 4.12 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 4.13 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 4.14 + echo "VENDOR = $(COMPANY_NAME)"; \ 4.15 + echo "VENDOR_URL = $(VENDOR_URL)"; \ 4.16 + echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \ 4.17 + echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \ 4.18 echo "OPENJDK = $(OPENJDK)"; \ 4.19 echo "$(LP64_SETTING/$(DATA_MODE))"; \ 4.20 echo; \
5.1 --- a/make/bsd/makefiles/vm.make Thu Jan 31 23:56:37 2019 +0800 5.2 +++ b/make/bsd/makefiles/vm.make Mon Apr 01 14:31:23 2019 +0200 5.3 @@ -1,5 +1,5 @@ 5.4 # 5.5 -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 5.6 +# Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. 5.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 5.8 # 5.9 # This code is free software; you can redistribute it and/or modify it 5.10 @@ -100,7 +100,8 @@ 5.11 # This is VERY important! The version define must only be supplied to vm_version.o 5.12 # If not, ccache will not re-use the cache at all, since the version string might contain 5.13 # a time and date. 5.14 -CXXFLAGS/vm_version.o += ${JRE_VERSION} 5.15 +CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS} 5.16 +CXXFLAGS/arguments.o += ${VERSION_CFLAGS} 5.17 5.18 CXXFLAGS/BYFILE = $(CXXFLAGS/$@) 5.19
6.1 --- a/make/linux/makefiles/buildtree.make Thu Jan 31 23:56:37 2019 +0800 6.2 +++ b/make/linux/makefiles/buildtree.make Mon Apr 01 14:31:23 2019 +0200 6.3 @@ -1,5 +1,6 @@ 6.4 # 6.5 # Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 6.6 +# Copyright 2019 Red Hat, Inc. 6.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 6.8 # 6.9 # This code is free software; you can redistribute it and/or modify it 6.10 @@ -220,6 +221,10 @@ 6.11 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 6.12 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 6.13 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 6.14 + echo "VENDOR = $(COMPANY_NAME)"; \ 6.15 + echo "VENDOR_URL = $(VENDOR_URL)"; \ 6.16 + echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \ 6.17 + echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \ 6.18 echo "OPENJDK = $(OPENJDK)"; \ 6.19 echo "$(LP64_SETTING/$(DATA_MODE))"; \ 6.20 echo; \
7.1 --- a/make/linux/makefiles/vm.make Thu Jan 31 23:56:37 2019 +0800 7.2 +++ b/make/linux/makefiles/vm.make Mon Apr 01 14:31:23 2019 +0200 7.3 @@ -1,5 +1,5 @@ 7.4 # 7.5 -# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. 7.6 +# Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. 7.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 7.8 # 7.9 # This code is free software; you can redistribute it and/or modify it 7.10 @@ -102,7 +102,8 @@ 7.11 # This is VERY important! The version define must only be supplied to vm_version.o 7.12 # If not, ccache will not re-use the cache at all, since the version string might contain 7.13 # a time and date. 7.14 -CXXFLAGS/vm_version.o += ${JRE_VERSION} 7.15 +CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS} 7.16 +CXXFLAGS/arguments.o += ${VERSION_CFLAGS} 7.17 7.18 CXXFLAGS/BYFILE = $(CXXFLAGS/$@) 7.19
8.1 --- a/make/openjdk_distro Thu Jan 31 23:56:37 2019 +0800 8.2 +++ b/make/openjdk_distro Mon Apr 01 14:31:23 2019 +0200 8.3 @@ -1,5 +1,6 @@ 8.4 # 8.5 # Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. 8.6 +# Copyright 2019 Red Hat, Inc. 8.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 8.8 # 8.9 # This code is free software; you can redistribute it and/or modify it 8.10 @@ -28,5 +29,4 @@ 8.11 8.12 # Don't put quotes (fail windows build). 8.13 HOTSPOT_VM_DISTRO=OpenJDK 8.14 -COMPANY_NAME= 8.15 PRODUCT_NAME=OpenJDK
9.1 --- a/make/solaris/makefiles/buildtree.make Thu Jan 31 23:56:37 2019 +0800 9.2 +++ b/make/solaris/makefiles/buildtree.make Mon Apr 01 14:31:23 2019 +0200 9.3 @@ -1,5 +1,6 @@ 9.4 # 9.5 # Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. 9.6 +# Copyright 2019 Red Hat, Inc. 9.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 9.8 # 9.9 # This code is free software; you can redistribute it and/or modify it 9.10 @@ -208,6 +209,10 @@ 9.11 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 9.12 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 9.13 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 9.14 + echo "VENDOR = $(COMPANY_NAME)"; \ 9.15 + echo "VENDOR_URL = $(VENDOR_URL)"; \ 9.16 + echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \ 9.17 + echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \ 9.18 echo "OPENJDK = $(OPENJDK)"; \ 9.19 echo "$(LP64_SETTING/$(DATA_MODE))"; \ 9.20 echo; \
10.1 --- a/make/solaris/makefiles/vm.make Thu Jan 31 23:56:37 2019 +0800 10.2 +++ b/make/solaris/makefiles/vm.make Mon Apr 01 14:31:23 2019 +0200 10.3 @@ -1,5 +1,5 @@ 10.4 # 10.5 -# Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. 10.6 +# Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. 10.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 10.8 # 10.9 # This code is free software; you can redistribute it and/or modify it 10.10 @@ -88,7 +88,8 @@ 10.11 # This is VERY important! The version define must only be supplied to vm_version.o 10.12 # If not, ccache will not re-use the cache at all, since the version string might contain 10.13 # a time and date. 10.14 -CXXFLAGS/vm_version.o += ${JRE_VERSION} 10.15 +CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS} 10.16 +CXXFLAGS/arguments.o += ${VERSION_CFLAGS} 10.17 10.18 CXXFLAGS/BYFILE = $(CXXFLAGS/$@) 10.19
11.1 --- a/make/windows/build.make Thu Jan 31 23:56:37 2019 +0800 11.2 +++ b/make/windows/build.make Mon Apr 01 14:31:23 2019 +0200 11.3 @@ -1,5 +1,6 @@ 11.4 # 11.5 # Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 11.6 +# Copyright 2019 Red Hat, Inc. 11.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 11.8 # 11.9 # This code is free software; you can redistribute it and/or modify it 11.10 @@ -279,6 +280,10 @@ 11.11 @ echo HS_COMPANY=$(COMPANY_NAME) >> $@ 11.12 @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@ 11.13 @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@ 11.14 + @ echo VENDOR=$(VENDOR) >> $@ 11.15 + @ echo VENDOR_URL=$(VENDOR_URL) >> $@ 11.16 + @ echo VENDOR_URL_BUG=$(VENDOR_URL_BUG) >> $@ 11.17 + @ echo VENDOR_URL_VM_BUG=$(VENDOR_URL_VM_BUG) >> $@ 11.18 @ if "$(OPENJDK)" NEQ "" echo OPENJDK=$(OPENJDK) >> $@ 11.19 @ echo HS_COPYRIGHT=$(HOTSPOT_VM_COPYRIGHT) >> $@ 11.20 @ echo HS_NAME=$(PRODUCT_NAME) $(JDK_MKTG_VERSION) >> $@
12.1 --- a/make/windows/makefiles/vm.make Thu Jan 31 23:56:37 2019 +0800 12.2 +++ b/make/windows/makefiles/vm.make Mon Apr 01 14:31:23 2019 +0200 12.3 @@ -1,5 +1,6 @@ 12.4 # 12.5 # Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights reserved. 12.6 +# Copyright 2019 Red Hat, Inc. 12.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 12.8 # 12.9 # This code is free software; you can redistribute it and/or modify it 12.10 @@ -61,6 +62,10 @@ 12.11 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" 12.12 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" 12.13 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" 12.14 +CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR=\"$(COMPANY_NAME)\"" 12.15 +CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL=\"$(VENDOR_URL)\"" 12.16 +CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL_BUG=\"$(VENDOR_URL_BUG)\"" 12.17 +CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL_VM_BUG=\"$(VENDOR_URL_VM_BUG)\"" 12.18 12.19 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS) 12.20
13.1 --- a/src/share/vm/runtime/arguments.cpp Thu Jan 31 23:56:37 2019 +0800 13.2 +++ b/src/share/vm/runtime/arguments.cpp Mon Apr 01 14:31:23 2019 +0200 13.3 @@ -1,5 +1,5 @@ 13.4 /* 13.5 - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. 13.6 + * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. 13.7 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 13.8 * 13.9 * This code is free software; you can redistribute it and/or modify it 13.10 @@ -66,7 +66,11 @@ 13.11 #endif // INCLUDE_ALL_GCS 13.12 13.13 // Note: This is a special bug reporting site for the JVM 13.14 -#define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp" 13.15 +#ifdef VENDOR_URL_VM_BUG 13.16 +# define DEFAULT_VENDOR_URL_BUG VENDOR_URL_VM_BUG 13.17 +#else 13.18 +# define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp" 13.19 +#endif 13.20 #define DEFAULT_JAVA_LAUNCHER "generic" 13.21 13.22 // Disable options not supported in this release, with a warning if they
14.1 --- a/src/share/vm/runtime/vm_version.cpp Thu Jan 31 23:56:37 2019 +0800 14.2 +++ b/src/share/vm/runtime/vm_version.cpp Mon Apr 01 14:31:23 2019 +0200 14.3 @@ -140,7 +140,7 @@ 14.4 14.5 const char* Abstract_VM_Version::vm_vendor() { 14.6 #ifdef VENDOR 14.7 - return XSTR(VENDOR); 14.8 + return VENDOR; 14.9 #else 14.10 return JDK_Version::is_gte_jdk17x_version() ? 14.11 "Oracle Corporation" : "Sun Microsystems Inc.";
