Mercurial > jdk8-mips64-public > hotspot / changeset
changeset
Merge
Wed, 29 Jan 2020 07:06:55 +0000
- author
- andrew
- date
- Wed, 29 Jan 2020 07:06:55 +0000
- changeset 9826
- 813683371450
- parent 9821
- 0cf14bdd73fe
- parent 9825
- 04f3503b80c5
- child 9827
- 5bd3b8c05552
Merge
1.1 --- a/THIRD_PARTY_README Sat Jan 25 06:42:32 2020 +0000 1.2 +++ b/THIRD_PARTY_README Wed Jan 29 07:06:55 2020 +0000 1.3 @@ -1710,10 +1710,9 @@ 1.4 1.5 --- begin of LICENSE --- 1.6 1.7 - Mesa 3-D graphics library 1.8 - Version: 5.0 1.9 - 1.10 - Copyright (C) 1999-2002 Brian Paul All Rights Reserved. 1.11 + Mesa 3-D Graphics Library v19.2.1 1.12 + 1.13 + Copyright (C) 1999-2007 Brian Paul All Rights Reserved. 1.14 1.15 Permission is hereby granted, free of charge, to any person obtaining a 1.16 copy of this software and associated documentation files (the "Software"), 1.17 @@ -1728,9 +1727,118 @@ 1.18 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 1.19 OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 1.20 FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 1.21 - BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN 1.22 - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN 1.23 - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. 1.24 + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 1.25 + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 1.26 + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 1.27 + SOFTWARE. 1.28 + 1.29 +Attention, Contributors 1.30 + 1.31 +When contributing to the Mesa project you must agree to the licensing terms 1.32 +of the component to which you're contributing. 1.33 +The following section lists the primary components of the Mesa distribution 1.34 +and their respective licenses. 1.35 +Mesa Component Licenses 1.36 + 1.37 + 1.38 + 1.39 +Component Location License 1.40 +------------------------------------------------------------------ 1.41 +Main Mesa code src/mesa/ MIT 1.42 +Device drivers src/mesa/drivers/* MIT, generally 1.43 + 1.44 +Gallium code src/gallium/ MIT 1.45 + 1.46 +Ext headers GL/glext.h Khronos 1.47 + GL/glxext.h Khronos 1.48 + GL/wglext.h Khronos 1.49 + KHR/khrplatform.h Khronos 1.50 + 1.51 +***************************************************************************** 1.52 + 1.53 +---- 1.54 +include/GL/gl.h : 1.55 + 1.56 + 1.57 + Mesa 3-D graphics library 1.58 + 1.59 + Copyright (C) 1999-2006 Brian Paul All Rights Reserved. 1.60 + Copyright (C) 2009 VMware, Inc. All Rights Reserved. 1.61 + 1.62 + Permission is hereby granted, free of charge, to any person obtaining a 1.63 + copy of this software and associated documentation files (the "Software"), 1.64 + to deal in the Software without restriction, including without limitation 1.65 + the rights to use, copy, modify, merge, publish, distribute, sublicense, 1.66 + and/or sell copies of the Software, and to permit persons to whom the 1.67 + Software is furnished to do so, subject to the following conditions: 1.68 + 1.69 + The above copyright notice and this permission notice shall be included 1.70 + in all copies or substantial portions of the Software. 1.71 + 1.72 + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 1.73 + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 1.74 + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL 1.75 + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 1.76 + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, 1.77 + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR 1.78 + OTHER DEALINGS IN THE SOFTWARE. 1.79 + 1.80 + ***************************************************************************** 1.81 + 1.82 +---- 1.83 +include/GL/glext.h 1.84 +include/GL/glxext.h 1.85 +include/GL/wglxext.h : 1.86 + 1.87 + 1.88 + Copyright (c) 2013 - 2018 The Khronos Group Inc. 1.89 + 1.90 + Permission is hereby granted, free of charge, to any person obtaining a 1.91 + copy of this software and/or associated documentation files (the 1.92 + "Materials"), to deal in the Materials without restriction, including 1.93 + without limitation the rights to use, copy, modify, merge, publish, 1.94 + distribute, sublicense, and/or sell copies of the Materials, and to 1.95 + permit persons to whom the Materials are furnished to do so, subject to 1.96 + the following conditions: 1.97 + 1.98 + The above copyright notice and this permission notice shall be included 1.99 + in all copies or substantial portions of the Materials. 1.100 + 1.101 + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 1.102 + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 1.103 + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 1.104 + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 1.105 + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 1.106 + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 1.107 + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. 1.108 + 1.109 + ***************************************************************************** 1.110 + 1.111 +---- 1.112 +include/KHR/khrplatform.h : 1.113 + 1.114 + Copyright (c) 2008 - 2018 The Khronos Group Inc. 1.115 + 1.116 + Permission is hereby granted, free of charge, to any person obtaining a 1.117 + copy of this software and/or associated documentation files (the 1.118 + "Materials"), to deal in the Materials without restriction, including 1.119 + without limitation the rights to use, copy, modify, merge, publish, 1.120 + distribute, sublicense, and/or sell copies of the Materials, and to 1.121 + permit persons to whom the Materials are furnished to do so, subject to 1.122 + the following conditions: 1.123 + 1.124 + The above copyright notice and this permission notice shall be included 1.125 + in all copies or substantial portions of the Materials. 1.126 + 1.127 + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 1.128 + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 1.129 + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 1.130 + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 1.131 + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 1.132 + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 1.133 + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. 1.134 + 1.135 + ***************************************************************************** 1.136 1.137 --- end of LICENSE --- 1.138
2.1 --- a/make/windows/build.make Sat Jan 25 06:42:32 2020 +0000 2.2 +++ b/make/windows/build.make Wed Jan 29 07:06:55 2020 +0000 2.3 @@ -280,7 +280,7 @@ 2.4 @ echo HS_COMPANY=$(COMPANY_NAME) >> $@ 2.5 @ echo HS_FILEDESC=$(HS_FILEDESC) >> $@ 2.6 @ echo HOTSPOT_VM_DISTRO=$(HOTSPOT_VM_DISTRO) >> $@ 2.7 - @ echo VENDOR=$(VENDOR) >> $@ 2.8 + @ echo VENDOR=$(COMPANY_NAME) >> $@ 2.9 @ echo VENDOR_URL=$(VENDOR_URL) >> $@ 2.10 @ echo VENDOR_URL_BUG=$(VENDOR_URL_BUG) >> $@ 2.11 @ echo VENDOR_URL_VM_BUG=$(VENDOR_URL_VM_BUG) >> $@
3.1 --- a/make/windows/makefiles/compile.make Sat Jan 25 06:42:32 2020 +0000 3.2 +++ b/make/windows/makefiles/compile.make Wed Jan 29 07:06:55 2020 +0000 3.3 @@ -346,7 +346,7 @@ 3.4 /D "HS_BUILD_ID=$(HS_BUILD_ID)" \ 3.5 /D "JDK_VER=$(JDK_VER)" \ 3.6 /D "JDK_DOTVER=$(JDK_DOTVER)" \ 3.7 - /D "HS_COMPANY=$(HS_COMPANY)" \ 3.8 + /D "HS_COMPANY=$(COMPANY_NAME)" \ 3.9 /D "HS_FILEDESC=$(HS_FILEDESC)" \ 3.10 /D "HS_COPYRIGHT=$(HS_COPYRIGHT)" \ 3.11 /D "HS_FNAME=$(HS_FNAME)" \
4.1 --- a/make/windows/makefiles/defs.make Sat Jan 25 06:42:32 2020 +0000 4.2 +++ b/make/windows/makefiles/defs.make Wed Jan 29 07:06:55 2020 +0000 4.3 @@ -157,6 +157,15 @@ 4.4 MAKE_ARGS += RM="$(RM)" 4.5 MAKE_ARGS += ZIPEXE=$(ZIPEXE) 4.6 4.7 +MAKE_ARGS += COMPANY_NAME="$(COMPANY_NAME)" 4.8 +MAKE_ARGS += VENDOR_URL=$(VENDOR_URL) 4.9 +MAKE_ARGS += VENDOR_URL_BUG=$(VENDOR_URL_BUG) 4.10 +MAKE_ARGS += VENDOR_URL_VM_BUG=$(VENDOR_URL_VM_BUG) 4.11 +ifneq ($(VERSION_CFLAGS),) 4.12 + # transform syntax from -DProp='"Value"' to /D "Prop=\"Value\"" for Windows build 4.13 + MAKE_ARGS += VERSION_CFLAGS="$(subst -D,/D \",$(subst ',,$(subst '$() $(),\"$() $(),$(subst ",\\\",$(VERSION_CFLAGS)))))\"" 4.14 +endif 4.15 + 4.16 # On 32 bit windows we build server and client, on 64 bit just server. 4.17 ifeq ($(JVM_VARIANTS),) 4.18 ifeq ($(ARCH_DATA_MODEL), 32)
5.1 --- a/make/windows/makefiles/vm.make Sat Jan 25 06:42:32 2020 +0000 5.2 +++ b/make/windows/makefiles/vm.make Wed Jan 29 07:06:55 2020 +0000 5.3 @@ -62,10 +62,6 @@ 5.4 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_TARGET=\"$(BUILD_FLAVOR)\"" 5.5 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_BUILD_USER=\"$(BuildUser)\"" 5.6 CXX_FLAGS=$(CXX_FLAGS) /D "HOTSPOT_VM_DISTRO=\"$(HOTSPOT_VM_DISTRO)\"" 5.7 -CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR=\"$(COMPANY_NAME)\"" 5.8 -CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL=\"$(VENDOR_URL)\"" 5.9 -CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL_BUG=\"$(VENDOR_URL_BUG)\"" 5.10 -CXX_FLAGS=$(CXX_FLAGS) /D "VENDOR_URL_VM_BUG=\"$(VENDOR_URL_VM_BUG)\"" 5.11 5.12 CXX_FLAGS=$(CXX_FLAGS) $(CXX_INCLUDE_DIRS) 5.13 5.14 @@ -209,6 +205,14 @@ 5.15 bytecodeInterpreterWithChecks.obj: ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 5.16 $(CXX) $(CXX_FLAGS) $(CXX_DONT_USE_PCH) /c ..\generated\jvmtifiles\bytecodeInterpreterWithChecks.cpp 5.17 5.18 +#files compiled with version flags 5.19 + 5.20 +vm_version.obj: $(WorkSpace)\src\share\vm\runtime\vm_version.cpp 5.21 + $(CXX) $(CXX_FLAGS) $(VERSION_CFLAGS) $(CXX_USE_PCH) /c $(WorkSpace)\src\share\vm\runtime\vm_version.cpp 5.22 + 5.23 +arguments.obj: $(WorkSpace)\src\share\vm\runtime\arguments.cpp 5.24 + $(CXX) $(CXX_FLAGS) $(VERSION_CFLAGS) $(CXX_USE_PCH) /c $(WorkSpace)\src\share\vm\runtime\arguments.cpp 5.25 + 5.26 # Default rules for the Virtual Machine 5.27 {$(COMMONSRC)\share\vm\c1}.cpp.obj:: 5.28 $(CXX) $(CXX_FLAGS) $(CXX_USE_PCH) /c $<
6.1 --- a/src/share/vm/opto/node.cpp Sat Jan 25 06:42:32 2020 +0000 6.2 +++ b/src/share/vm/opto/node.cpp Wed Jan 29 07:06:55 2020 +0000 6.3 @@ -286,6 +286,10 @@ 6.4 #ifdef _MSC_VER // the IDX_INIT hack falls foul of warning C4355 6.5 #pragma warning( disable:4355 ) // 'this' : used in base member initializer list 6.6 #endif 6.7 +#ifdef __clang__ 6.8 +#pragma clang diagnostic push 6.9 +#pragma GCC diagnostic ignored "-Wuninitialized" 6.10 +#endif 6.11 6.12 // Out-of-line code from node constructors. 6.13 // Executed only when extra debug info. is being passed around. 6.14 @@ -493,6 +497,10 @@ 6.15 _in[6] = n6; if (n6 != NULL) n6->add_out((Node *)this); 6.16 } 6.17 6.18 +#ifdef __clang__ 6.19 +#pragma clang diagnostic pop 6.20 +#endif 6.21 + 6.22 6.23 //------------------------------clone------------------------------------------ 6.24 // Clone a Node.
