Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
8189761: COMPANY_NAME, IMPLEMENTOR, BUNDLE_VENDOR, VENDOR, but no configure flag
Fri, 29 Mar 2019 15:03:32 +0000
- author
- andrew
- date
- Fri, 29 Mar 2019 15:03:32 +0000
- changeset 9634
- d1520f0c3524
- parent 9633
- 6e2900603bc6
- child 9635
- 2d94aac71d33
8189761: COMPANY_NAME, IMPLEMENTOR, BUNDLE_VENDOR, VENDOR, but no configure flag
Reviewed-by: erikj, dholmes
1.1 --- a/make/aix/makefiles/buildtree.make Mon Mar 18 08:33:53 2019 +0100 1.2 +++ b/make/aix/makefiles/buildtree.make Fri Mar 29 15:03:32 2019 +0000 1.3 @@ -1,6 +1,7 @@ 1.4 # 1.5 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 1.6 # Copyright 2012, 2013 SAP AG. All rights reserved. 1.7 +# Copyright 2019 Red Hat, Inc. 1.8 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 1.9 # 1.10 # This code is free software; you can redistribute it and/or modify it 1.11 @@ -215,6 +216,10 @@ 1.12 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 1.13 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 1.14 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 1.15 + echo "VENDOR = $(COMPANY_NAME)"; \ 1.16 + echo "VENDOR_URL = $(VENDOR_URL)"; \ 1.17 + echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \ 1.18 + echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \ 1.19 echo "OPENJDK = $(OPENJDK)"; \ 1.20 echo "$(LP64_SETTING/$(DATA_MODE))"; \ 1.21 echo; \
2.1 --- a/make/aix/makefiles/vm.make Mon Mar 18 08:33:53 2019 +0100 2.2 +++ b/make/aix/makefiles/vm.make Fri Mar 29 15:03:32 2019 +0000 2.3 @@ -1,5 +1,5 @@ 2.4 # 2.5 -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 2.6 +# Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. 2.7 # Copyright 2012, 2013 SAP AG. All rights reserved. 2.8 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 2.9 # 2.10 @@ -101,7 +101,8 @@ 2.11 # This is VERY important! The version define must only be supplied to vm_version.o 2.12 # If not, ccache will not re-use the cache at all, since the version string might contain 2.13 # a time and date. 2.14 -CXXFLAGS/vm_version.o += ${JRE_VERSION} 2.15 +CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS} 2.16 +CXXFLAGS/arguments.o += ${VERSION_CFLAGS} 2.17 2.18 CXXFLAGS/BYFILE = $(CXXFLAGS/$@) 2.19
3.1 --- a/make/bsd/makefiles/buildtree.make Mon Mar 18 08:33:53 2019 +0100 3.2 +++ b/make/bsd/makefiles/buildtree.make Fri Mar 29 15:03:32 2019 +0000 3.3 @@ -1,5 +1,6 @@ 3.4 # 3.5 # Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved. 3.6 +# Copyright 2019 Red Hat Inc. 3.7 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. 3.8 # 3.9 # This code is free software; you can redistribute it and/or modify it 3.10 @@ -221,6 +222,10 @@ 3.11 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 3.12 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 3.13 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 3.14 + echo "VENDOR = $(COMPANY_NAME)"; \ 3.15 + echo "VENDOR_URL = $(VENDOR_URL)"; \ 3.16 + echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \ 3.17 + echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \ 3.18 echo "OPENJDK = $(OPENJDK)"; \ 3.19 echo "$(LP64_SETTING/$(DATA_MODE))"; \ 3.20 echo; \
4.1 --- a/make/bsd/makefiles/vm.make Mon Mar 18 08:33:53 2019 +0100 4.2 +++ b/make/bsd/makefiles/vm.make Fri Mar 29 15:03:32 2019 +0000 4.3 @@ -1,5 +1,5 @@ 4.4 # 4.5 -# Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved. 4.6 +# Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. 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 @@ -100,7 +100,8 @@ 4.11 # This is VERY important! The version define must only be supplied to vm_version.o 4.12 # If not, ccache will not re-use the cache at all, since the version string might contain 4.13 # a time and date. 4.14 -CXXFLAGS/vm_version.o += ${JRE_VERSION} 4.15 +CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS} 4.16 +CXXFLAGS/arguments.o += ${VERSION_CFLAGS} 4.17 4.18 CXXFLAGS/BYFILE = $(CXXFLAGS/$@) 4.19
5.1 --- a/make/linux/makefiles/buildtree.make Mon Mar 18 08:33:53 2019 +0100 5.2 +++ b/make/linux/makefiles/buildtree.make Fri Mar 29 15:03:32 2019 +0000 5.3 @@ -1,5 +1,6 @@ 5.4 # 5.5 # Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. 5.6 +# Copyright 2019 Red Hat, Inc. 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 @@ -220,6 +221,10 @@ 5.11 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 5.12 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 5.13 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 5.14 + echo "VENDOR = $(COMPANY_NAME)"; \ 5.15 + echo "VENDOR_URL = $(VENDOR_URL)"; \ 5.16 + echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \ 5.17 + echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \ 5.18 echo "OPENJDK = $(OPENJDK)"; \ 5.19 echo "$(LP64_SETTING/$(DATA_MODE))"; \ 5.20 echo; \
6.1 --- a/make/linux/makefiles/vm.make Mon Mar 18 08:33:53 2019 +0100 6.2 +++ b/make/linux/makefiles/vm.make Fri Mar 29 15:03:32 2019 +0000 6.3 @@ -1,5 +1,5 @@ 6.4 # 6.5 -# Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. 6.6 +# Copyright (c) 1999, 2019, Oracle and/or its affiliates. All rights reserved. 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 @@ -102,7 +102,8 @@ 6.11 # This is VERY important! The version define must only be supplied to vm_version.o 6.12 # If not, ccache will not re-use the cache at all, since the version string might contain 6.13 # a time and date. 6.14 -CXXFLAGS/vm_version.o += ${JRE_VERSION} 6.15 +CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS} 6.16 +CXXFLAGS/arguments.o += ${VERSION_CFLAGS} 6.17 6.18 CXXFLAGS/BYFILE = $(CXXFLAGS/$@) 6.19
7.1 --- a/make/openjdk_distro Mon Mar 18 08:33:53 2019 +0100 7.2 +++ b/make/openjdk_distro Fri Mar 29 15:03:32 2019 +0000 7.3 @@ -1,5 +1,6 @@ 7.4 # 7.5 # Copyright (c) 2007, 2008, Oracle and/or its affiliates. All rights reserved. 7.6 +# Copyright 2019 Red Hat, Inc. 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 @@ -28,5 +29,4 @@ 7.11 7.12 # Don't put quotes (fail windows build). 7.13 HOTSPOT_VM_DISTRO=OpenJDK 7.14 -COMPANY_NAME= 7.15 PRODUCT_NAME=OpenJDK
8.1 --- a/make/solaris/makefiles/buildtree.make Mon Mar 18 08:33:53 2019 +0100 8.2 +++ b/make/solaris/makefiles/buildtree.make Fri Mar 29 15:03:32 2019 +0000 8.3 @@ -1,5 +1,6 @@ 8.4 # 8.5 # Copyright (c) 2000, 2013, 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 @@ -208,6 +209,10 @@ 8.11 echo "SA_BUILD_VERSION = $(HS_BUILD_VER)"; \ 8.12 echo "HOTSPOT_BUILD_USER = $(HOTSPOT_BUILD_USER)"; \ 8.13 echo "HOTSPOT_VM_DISTRO = $(HOTSPOT_VM_DISTRO)"; \ 8.14 + echo "VENDOR = $(COMPANY_NAME)"; \ 8.15 + echo "VENDOR_URL = $(VENDOR_URL)"; \ 8.16 + echo "VENDOR_URL_BUG = $(VENDOR_URL_BUG)"; \ 8.17 + echo "VENDOR_URL_VM_BUG = $(VENDOR_URL_VM_BUG)"; \ 8.18 echo "OPENJDK = $(OPENJDK)"; \ 8.19 echo "$(LP64_SETTING/$(DATA_MODE))"; \ 8.20 echo; \
9.1 --- a/make/solaris/makefiles/vm.make Mon Mar 18 08:33:53 2019 +0100 9.2 +++ b/make/solaris/makefiles/vm.make Fri Mar 29 15:03:32 2019 +0000 9.3 @@ -1,5 +1,5 @@ 9.4 # 9.5 -# Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. 9.6 +# Copyright (c) 1998, 2019, Oracle and/or its affiliates. All rights reserved. 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 @@ -88,7 +88,8 @@ 9.11 # This is VERY important! The version define must only be supplied to vm_version.o 9.12 # If not, ccache will not re-use the cache at all, since the version string might contain 9.13 # a time and date. 9.14 -CXXFLAGS/vm_version.o += ${JRE_VERSION} 9.15 +CXXFLAGS/vm_version.o += ${JRE_VERSION} ${VERSION_CFLAGS} 9.16 +CXXFLAGS/arguments.o += ${VERSION_CFLAGS} 9.17 9.18 CXXFLAGS/BYFILE = $(CXXFLAGS/$@) 9.19
10.1 --- a/make/windows/build.make Mon Mar 18 08:33:53 2019 +0100 10.2 +++ b/make/windows/build.make Fri Mar 29 15:03:32 2019 +0000 10.3 @@ -1,5 +1,6 @@ 10.4 # 10.5 # Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. 10.6 +# Copyright 2019 Red Hat, Inc. 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 @@ -279,6 +280,10 @@ 10.11 @ echo HS_COMPANY=$(COMPANY_NAME) >> $@ 10.12 @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@ 10.13 @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@ 10.14 + @ echo VENDOR=$(VENDOR) >> $@ 10.15 + @ echo VENDOR_URL=$(VENDOR_URL) >> $@ 10.16 + @ echo VENDOR_URL_BUG=$(VENDOR_URL_BUG) >> $@ 10.17 + @ echo VENDOR_URL_VM_BUG=$(VENDOR_URL_VM_BUG) >> $@ 10.18 @ if "$(OPENJDK)" NEQ "" echo OPENJDK=$(OPENJDK) >> $@ 10.19 @ echo HS_COPYRIGHT=$(HOTSPOT_VM_COPYRIGHT) >> $@ 10.20 @ echo HS_NAME=$(PRODUCT_NAME) $(JDK_MKTG_VERSION) >> $@
11.1 --- a/make/windows/makefiles/vm.make Mon Mar 18 08:33:53 2019 +0100 11.2 +++ b/make/windows/makefiles/vm.make Fri Mar 29 15:03:32 2019 +0000 11.3 @@ -1,5 +1,6 @@ 11.4 # 11.5 # Copyright (c) 1997, 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 @@ -61,6 +62,10 @@ 11.11 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" 11.12 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" 11.13 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" 11.14 +CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR=\"$(COMPANY_NAME)\"" 11.15 +CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL=\"$(VENDOR_URL)\"" 11.16 +CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL_BUG=\"$(VENDOR_URL_BUG)\"" 11.17 +CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL_VM_BUG=\"$(VENDOR_URL_VM_BUG)\"" 11.18 11.19 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS) 11.20
12.1 --- a/src/share/vm/runtime/arguments.cpp Mon Mar 18 08:33:53 2019 +0100 12.2 +++ b/src/share/vm/runtime/arguments.cpp Fri Mar 29 15:03:32 2019 +0000 12.3 @@ -1,5 +1,5 @@ 12.4 /* 12.5 - * Copyright (c) 1997, 2018, Oracle and/or its affiliates. All rights reserved. 12.6 + * Copyright (c) 1997, 2019, Oracle and/or its affiliates. All rights reserved. 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 @@ -66,7 +66,11 @@ 12.11 #endif // INCLUDE_ALL_GCS 12.12 12.13 // Note: This is a special bug reporting site for the JVM 12.14 -#define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp" 12.15 +#ifdef VENDOR_URL_VM_BUG 12.16 +# define DEFAULT_VENDOR_URL_BUG VENDOR_URL_VM_BUG 12.17 +#else 12.18 +# define DEFAULT_VENDOR_URL_BUG "http://bugreport.java.com/bugreport/crash.jsp" 12.19 +#endif 12.20 #define DEFAULT_JAVA_LAUNCHER "generic" 12.21 12.22 // Disable options not supported in this release, with a warning if they
