diff options
author | Alexey Ushakov <alexey.v.ushakov@gmail.com> | 2020-04-24 12:17:43 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-04-24 12:17:43 +0300 |
commit | 03cb58e55a364d556818d867d2d861405de06cfe (patch) | |
tree | 3cd0cbaf0e3cff6a3b6f8d4ba4cec9651e9b57f6 | |
parent | 80167d596b75a0e77ab21b443172934933d6c2df (diff) | |
parent | 3ac1f8d00451b8118122e49fb9dffd9da6d005b2 (diff) | |
download | jdk8u-jb8u252-b1649.tar.gz |
Merge pull request #21 from bell-sw/update_8u252jb8u252-b1649.5jb8u252-b1649.2jb8u252-b1649
jdk8u252 update
-rw-r--r-- | .hgtags | 11 | ||||
-rw-r--r-- | THIRD_PARTY_README | 118 | ||||
-rw-r--r-- | common/autoconf/flags.m4 | 25 | ||||
-rw-r--r-- | common/autoconf/generated-configure.sh | 39 | ||||
-rw-r--r-- | common/autoconf/hotspot-spec.gmk.in | 1 | ||||
-rw-r--r-- | common/autoconf/jdk-options.m4 | 2 | ||||
-rw-r--r-- | common/autoconf/toolchain_windows.m4 | 2 |
7 files changed, 182 insertions, 16 deletions
@@ -995,3 +995,14 @@ bb4532c15611d35d3136eeb287049da79ce01ebb jdk8u242-b05 8ca5f59e3042b7353b64c131be6bb970ba489ce9 jdk8u242-b07 5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-b08 5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-ga +30768a181ad0f4ba3d37f00bf23d76c875cb043a jdk8u252-b00 +5f55e79422a0246076db7d3f2a2c44cb36e0e271 jdk8u252-b01 +a013ce3462fc144cc83347be67109c4e4e4b26ff jdk8u252-b02 +9fb3e77d22d6a616c33ae6feac9a847764968bc3 jdk8u252-b03 +6383ac7b39e4d10c1fa6bf174855bc259dd9cb22 jdk8u252-b04 +62c9a2725c6cbfcbd4c2d47c3751dbdecc2610ad jdk8u252-b05 +bb464170d34478503661419d2f2864af7553d696 jdk8u252-b06 +746815de8b5b0c661aa6a1fa9476be758cc51e17 jdk8u252-b07 +72a6d93679e5bee5d5192234b8421024233cf616 jdk8u252-b08 +343c4ea489d5d3b058c5e00339868e4f66c4995a jdk8u252-b09 +343c4ea489d5d3b058c5e00339868e4f66c4995a jdk8u252-ga diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README index 643ea79..a9adb43 100644 --- a/THIRD_PARTY_README +++ b/THIRD_PARTY_README @@ -1712,10 +1712,60 @@ which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions. --- begin of LICENSE --- + Mesa 3-D Graphics Library v19.2.1 + + Copyright (C) 1999-2007 Brian Paul All Rights Reserved. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and associated documentation files (the "Software"), + to deal in the Software without restriction, including without limitation + the rights to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to whom the + Software is furnished to do so, subject to the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + SOFTWARE. + +Attention, Contributors + +When contributing to the Mesa project you must agree to the licensing terms +of the component to which you're contributing. +The following section lists the primary components of the Mesa distribution +and their respective licenses. +Mesa Component Licenses + + + +Component Location License +------------------------------------------------------------------ +Main Mesa code src/mesa/ MIT +Device drivers src/mesa/drivers/* MIT, generally + +Gallium code src/gallium/ MIT + +Ext headers GL/glext.h Khronos + GL/glxext.h Khronos + GL/wglext.h Khronos + KHR/khrplatform.h Khronos + +***************************************************************************** + +---- +include/GL/gl.h : + + Mesa 3-D graphics library - Version: 5.0 - Copyright (C) 1999-2002 Brian Paul All Rights Reserved. + Copyright (C) 1999-2006 Brian Paul All Rights Reserved. + Copyright (C) 2009 VMware, Inc. All Rights Reserved. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), @@ -1730,9 +1780,67 @@ which may be included with JRE 8, JDK 8, and OpenJDK 8 source distributions. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + + ***************************************************************************** + +---- +include/GL/glext.h +include/GL/glxext.h +include/GL/wglxext.h : + + + Copyright (c) 2013 - 2018 The Khronos Group Inc. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and/or associated documentation files (the + "Materials"), to deal in the Materials without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Materials, and to + permit persons to whom the Materials are furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Materials. + + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + + ***************************************************************************** + +---- +include/KHR/khrplatform.h : + + Copyright (c) 2008 - 2018 The Khronos Group Inc. + + Permission is hereby granted, free of charge, to any person obtaining a + copy of this software and/or associated documentation files (the + "Materials"), to deal in the Materials without restriction, including + without limitation the rights to use, copy, modify, merge, publish, + distribute, sublicense, and/or sell copies of the Materials, and to + permit persons to whom the Materials are furnished to do so, subject to + the following conditions: + + The above copyright notice and this permission notice shall be included + in all copies or substantial portions of the Materials. + + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. + + ***************************************************************************** --- end of LICENSE --- diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 index 80544fa..9ddf505 100644 --- a/common/autoconf/flags.m4 +++ b/common/autoconf/flags.m4 @@ -156,6 +156,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS], if test "x$TOOLCHAIN_TYPE" = xgcc; then PICFLAG="-fPIC" + PIEFLAG="-fPIE" C_FLAG_REORDER='' CXX_FLAG_REORDER='' @@ -176,6 +177,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS], fi elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then PICFLAG="-KPIC" + PIEFLAG="" C_FLAG_REORDER='-xF' CXX_FLAG_REORDER='-xF' SHARED_LIBRARY_FLAGS="-G" @@ -185,6 +187,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS], SET_SHARED_LIBRARY_MAPFILE='-M[$]1' elif test "x$TOOLCHAIN_TYPE" = xxlc; then PICFLAG="-qpic=large" + PIEFLAG="" C_FLAG_REORDER='' CXX_FLAG_REORDER='' SHARED_LIBRARY_FLAGS="-qmkshrobj" @@ -194,6 +197,7 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_LIBS], SET_SHARED_LIBRARY_MAPFILE='' elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then PICFLAG="" + PIEFLAG="" C_FLAG_REORDER='' CXX_FLAG_REORDER='' SHARED_LIBRARY_FLAGS="-LD" @@ -418,6 +422,11 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags]) fi + + if test "x$ASFLAGS" != "x"; then + AC_MSG_WARN([Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags]) + fi + AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags], [extra flags to be used when compiling jdk c-files])]) @@ -427,6 +436,9 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags], [extra flags to be used when linking jdk])]) + AC_ARG_WITH(extra-asflags, [AS_HELP_STRING([--with-extra-asflags], + [extra flags to be passed to the assembler])]) + CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags" CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags" LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags" @@ -435,10 +447,12 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags" LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags" LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags" + LEGACY_EXTRA_ASFLAGS="$with_extra_asflags" AC_SUBST(LEGACY_EXTRA_CFLAGS) AC_SUBST(LEGACY_EXTRA_CXXFLAGS) AC_SUBST(LEGACY_EXTRA_LDFLAGS) + AC_SUBST(LEGACY_EXTRA_ASFLAGS) ############################################################################### # @@ -652,8 +666,8 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA " # Executable flags - CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK" - CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK" + CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG" + CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG" AC_SUBST(CFLAGS_JDKLIB) AC_SUBST(CFLAGS_JDKEXE) @@ -736,6 +750,13 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], if test "x$OPENJDK_TARGET_OS" = xlinux; then LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined" fi + if test "x$TOOLCHAIN_TYPE" = xgcc; then + # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous + # java heap. + if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then + LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie" + fi + fi fi AC_SUBST(LDFLAGS_JDKLIB) AC_SUBST(LDFLAGS_JDKEXE) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 15f0021..ceae055 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -689,6 +689,7 @@ MACOSX_VERSION_MIN FDLIBM_CFLAGS NO_LIFETIME_DSE_CFLAG NO_DELETE_NULL_POINTER_CHECKS_CFLAG +LEGACY_EXTRA_ASFLAGS LEGACY_EXTRA_LDFLAGS LEGACY_EXTRA_CXXFLAGS LEGACY_EXTRA_CFLAGS @@ -1085,6 +1086,7 @@ with_jtreg with_extra_cflags with_extra_cxxflags with_extra_ldflags +with_extra_asflags enable_debug_symbols enable_zip_debug_info with_native_debug_symbols @@ -1947,6 +1949,7 @@ Optional Packages: --with-extra-cflags extra flags to be used when compiling jdk c-files --with-extra-cxxflags extra flags to be used when compiling jdk c++-files --with-extra-ldflags extra flags to be used when linking jdk + --with-extra-asflags extra flags to be passed to the assembler --with-native-debug-symbols set the native debug symbol configuration (none, internal, external, zipped) [varying] @@ -4376,7 +4379,7 @@ VS_SDK_PLATFORM_NAME_2017= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1565358475 +DATE_WHEN_GENERATED=1585090987 ############################################################################### # @@ -19765,8 +19768,6 @@ fi if test "x$with_cacerts_file" != x; then CACERTS_FILE=$with_cacerts_file - else - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts fi @@ -41235,6 +41236,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; } if test "x$TOOLCHAIN_TYPE" = xgcc; then PICFLAG="-fPIC" + PIEFLAG="-fPIE" C_FLAG_REORDER='' CXX_FLAG_REORDER='' @@ -41255,6 +41257,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; } fi elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then PICFLAG="-KPIC" + PIEFLAG="" C_FLAG_REORDER='-xF' CXX_FLAG_REORDER='-xF' SHARED_LIBRARY_FLAGS="-G" @@ -41264,6 +41267,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; } SET_SHARED_LIBRARY_MAPFILE='-M$1' elif test "x$TOOLCHAIN_TYPE" = xxlc; then PICFLAG="-qpic=large" + PIEFLAG="" C_FLAG_REORDER='' CXX_FLAG_REORDER='' SHARED_LIBRARY_FLAGS="-qmkshrobj" @@ -41273,6 +41277,7 @@ $as_echo "$ac_cv_c_bigendian" >&6; } SET_SHARED_LIBRARY_MAPFILE='' elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then PICFLAG="" + PIEFLAG="" C_FLAG_REORDER='' CXX_FLAG_REORDER='' SHARED_LIBRARY_FLAGS="-LD" @@ -41503,6 +41508,12 @@ $as_echo "$as_me: WARNING: Ignoring LDFLAGS($LDFLAGS) found in environment. Use fi + if test "x$ASFLAGS" != "x"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&5 +$as_echo "$as_me: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&2;} + fi + + # Check whether --with-extra-cflags was given. if test "${with_extra_cflags+set}" = set; then : withval=$with_extra_cflags; @@ -41523,6 +41534,13 @@ if test "${with_extra_ldflags+set}" = set; then : fi + +# Check whether --with-extra-asflags was given. +if test "${with_extra_asflags+set}" = set; then : + withval=$with_extra_asflags; +fi + + CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags" CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags" LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags" @@ -41531,6 +41549,8 @@ fi LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags" LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags" LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags" + LEGACY_EXTRA_ASFLAGS="$with_extra_asflags" + @@ -42076,8 +42096,8 @@ $as_echo "$supports" >&6; } CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA " # Executable flags - CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK" - CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK" + CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG" + CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG" @@ -42160,6 +42180,13 @@ $as_echo "$supports" >&6; } if test "x$OPENJDK_TARGET_OS" = xlinux; then LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined" fi + if test "x$TOOLCHAIN_TYPE" = xgcc; then + # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous + # java heap. + if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then + LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie" + fi + fi fi @@ -51604,7 +51631,7 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UCRT DLL dir" >&5 $as_echo_n "checking for UCRT DLL dir... " >&6; } if test "x$with_ucrt_dll_dir" != x; then - if test -z "$(ls -d "$with_ucrt_dll_dir/*.dll" 2> /dev/null)"; then + if test -z "$(ls -d "$with_ucrt_dll_dir/"*.dll 2> /dev/null)"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } as_fn_error $? "Could not find any dlls in $with_ucrt_dll_dir" "$LINENO" 5 diff --git a/common/autoconf/hotspot-spec.gmk.in b/common/autoconf/hotspot-spec.gmk.in index 850133e..f7d3fce 100644 --- a/common/autoconf/hotspot-spec.gmk.in +++ b/common/autoconf/hotspot-spec.gmk.in @@ -115,6 +115,7 @@ EXTRA_CFLAGS=@LEGACY_EXTRA_CFLAGS@ $(NO_DELETE_NULL_POINTER_CHECKS_CFLAG) \ $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG) EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@ EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@ +EXTRA_ASFLAGS=@LEGACY_EXTRA_ASFLAGS@ USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@ diff --git a/common/autoconf/jdk-options.m4 b/common/autoconf/jdk-options.m4 index 6c84196..6f6c52a 100644 --- a/common/autoconf/jdk-options.m4 +++ b/common/autoconf/jdk-options.m4 @@ -389,8 +389,6 @@ AC_DEFUN_ONCE([JDKOPT_SETUP_JDK_OPTIONS], [specify alternative cacerts file])]) if test "x$with_cacerts_file" != x; then CACERTS_FILE=$with_cacerts_file - else - CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts fi AC_SUBST(CACERTS_FILE) diff --git a/common/autoconf/toolchain_windows.m4 b/common/autoconf/toolchain_windows.m4 index d82030c..a78f9ac 100644 --- a/common/autoconf/toolchain_windows.m4 +++ b/common/autoconf/toolchain_windows.m4 @@ -652,7 +652,7 @@ AC_DEFUN([TOOLCHAIN_SETUP_VS_RUNTIME_DLLS], if test "x$USE_UCRT" = "xtrue"; then AC_MSG_CHECKING([for UCRT DLL dir]) if test "x$with_ucrt_dll_dir" != x; then - if test -z "$(ls -d "$with_ucrt_dll_dir/*.dll" 2> /dev/null)"; then + if test -z "$(ls -d "$with_ucrt_dll_dir/"*.dll 2> /dev/null)"; then AC_MSG_RESULT([no]) AC_MSG_ERROR([Could not find any dlls in $with_ucrt_dll_dir]) else |