Merge mips64el-jdk8u252-b10

Wed, 15 Apr 2020 11:49:54 +0800

author
aoqi
date
Wed, 15 Apr 2020 11:49:54 +0800
changeset 2498
8c54aca26212
parent 2476
89e4aea44ab9
parent 2497
343c4ea489d5
child 2499
5f0639fe0126

Merge

.hgtags file | annotate | diff | comparison | revisions
THIRD_PARTY_README file | annotate | diff | comparison | revisions
common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/hotspot-spec.gmk.in file | annotate | diff | comparison | revisions
common/autoconf/jdk-options.m4 file | annotate | diff | comparison | revisions
common/autoconf/toolchain_windows.m4 file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Apr 15 11:14:57 2020 +0800
     1.2 +++ b/.hgtags	Wed Apr 15 11:49:54 2020 +0800
     1.3 @@ -1009,5 +1009,16 @@
     1.4  bb4532c15611d35d3136eeb287049da79ce01ebb jdk8u242-b05
     1.5  72443ad60b1e685bd50e7ec8f21adf66786863d1 jdk8u242-b06
     1.6  8ca5f59e3042b7353b64c131be6bb970ba489ce9 jdk8u242-b07
     1.7 +5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-b08
     1.8 +5b17d1f49219624f122ea2b05ec1c9f1adff8c64 jdk8u242-ga
     1.9  ffaf101a0a57a6b4fb85368ba73cbf1b1b9e13bd mips64el-jdk8u242-b09
    1.10  47580aab9a578637252eb1a831c183b4c0bf59b9 mips64el-jdk8u242-b10
    1.11 +30768a181ad0f4ba3d37f00bf23d76c875cb043a jdk8u252-b00
    1.12 +5f55e79422a0246076db7d3f2a2c44cb36e0e271 jdk8u252-b01
    1.13 +a013ce3462fc144cc83347be67109c4e4e4b26ff jdk8u252-b02
    1.14 +9fb3e77d22d6a616c33ae6feac9a847764968bc3 jdk8u252-b03
    1.15 +6383ac7b39e4d10c1fa6bf174855bc259dd9cb22 jdk8u252-b04
    1.16 +62c9a2725c6cbfcbd4c2d47c3751dbdecc2610ad jdk8u252-b05
    1.17 +bb464170d34478503661419d2f2864af7553d696 jdk8u252-b06
    1.18 +746815de8b5b0c661aa6a1fa9476be758cc51e17 jdk8u252-b07
    1.19 +72a6d93679e5bee5d5192234b8421024233cf616 jdk8u252-b08
     2.1 --- a/THIRD_PARTY_README	Wed Apr 15 11:14:57 2020 +0800
     2.2 +++ b/THIRD_PARTY_README	Wed Apr 15 11:49:54 2020 +0800
     2.3 @@ -1712,10 +1712,9 @@
     2.4  
     2.5  --- begin of LICENSE ---
     2.6  
     2.7 - Mesa 3-D graphics library
     2.8 - Version:  5.0
     2.9 -
    2.10 - Copyright (C) 1999-2002  Brian Paul   All Rights Reserved.
    2.11 + Mesa 3-D Graphics Library v19.2.1
    2.12 +
    2.13 + Copyright (C) 1999-2007  Brian Paul   All Rights Reserved.
    2.14  
    2.15   Permission is hereby granted, free of charge, to any person obtaining a
    2.16   copy of this software and associated documentation files (the "Software"),
    2.17 @@ -1730,9 +1729,118 @@
    2.18   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
    2.19   OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    2.20   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
    2.21 - BRIAN PAUL BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
    2.22 - AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
    2.23 - CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
    2.24 + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    2.25 + LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    2.26 + OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    2.27 + SOFTWARE.
    2.28 +
    2.29 +Attention, Contributors
    2.30 +
    2.31 +When contributing to the Mesa project you must agree to the licensing terms
    2.32 +of the component to which you're contributing.
    2.33 +The following section lists the primary components of the Mesa distribution
    2.34 +and their respective licenses.
    2.35 +Mesa Component Licenses
    2.36 +
    2.37 +
    2.38 +
    2.39 +Component         Location               License
    2.40 +------------------------------------------------------------------
    2.41 +Main Mesa code    src/mesa/              MIT
    2.42 +Device drivers    src/mesa/drivers/*     MIT, generally
    2.43 +
    2.44 +Gallium code      src/gallium/           MIT
    2.45 +
    2.46 +Ext headers       GL/glext.h             Khronos
    2.47 +                  GL/glxext.h            Khronos
    2.48 +                  GL/wglext.h            Khronos
    2.49 +                  KHR/khrplatform.h      Khronos
    2.50 +
    2.51 +*****************************************************************************
    2.52 +
    2.53 +----
    2.54 +include/GL/gl.h :
    2.55 +
    2.56 +
    2.57 + Mesa 3-D graphics library
    2.58 +
    2.59 + Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
    2.60 + Copyright (C) 2009  VMware, Inc.  All Rights Reserved.
    2.61 +
    2.62 + Permission is hereby granted, free of charge, to any person obtaining a
    2.63 + copy of this software and associated documentation files (the "Software"),
    2.64 + to deal in the Software without restriction, including without limitation
    2.65 + the rights to use, copy, modify, merge, publish, distribute, sublicense,
    2.66 + and/or sell copies of the Software, and to permit persons to whom the
    2.67 + Software is furnished to do so, subject to the following conditions:
    2.68 +
    2.69 + The above copyright notice and this permission notice shall be included
    2.70 + in all copies or substantial portions of the Software.
    2.71 +
    2.72 + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
    2.73 + OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    2.74 + FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
    2.75 + THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
    2.76 + OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
    2.77 + ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
    2.78 + OTHER DEALINGS IN THE SOFTWARE.
    2.79 + 
    2.80 + *****************************************************************************
    2.81 +
    2.82 +----
    2.83 +include/GL/glext.h
    2.84 +include/GL/glxext.h
    2.85 +include/GL/wglxext.h :
    2.86 +
    2.87 +
    2.88 + Copyright (c) 2013 - 2018 The Khronos Group Inc.
    2.89 +
    2.90 + Permission is hereby granted, free of charge, to any person obtaining a
    2.91 + copy of this software and/or associated documentation files (the
    2.92 + "Materials"), to deal in the Materials without restriction, including
    2.93 + without limitation the rights to use, copy, modify, merge, publish,
    2.94 + distribute, sublicense, and/or sell copies of the Materials, and to
    2.95 + permit persons to whom the Materials are furnished to do so, subject to
    2.96 + the following conditions:
    2.97 +
    2.98 + The above copyright notice and this permission notice shall be included
    2.99 + in all copies or substantial portions of the Materials.
   2.100 +
   2.101 + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
   2.102 + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   2.103 + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   2.104 + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   2.105 + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   2.106 + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   2.107 + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
   2.108 +
   2.109 + *****************************************************************************
   2.110 +
   2.111 +----
   2.112 +include/KHR/khrplatform.h :
   2.113 +
   2.114 + Copyright (c) 2008 - 2018 The Khronos Group Inc.
   2.115 +
   2.116 + Permission is hereby granted, free of charge, to any person obtaining a
   2.117 + copy of this software and/or associated documentation files (the
   2.118 + "Materials"), to deal in the Materials without restriction, including
   2.119 + without limitation the rights to use, copy, modify, merge, publish,
   2.120 + distribute, sublicense, and/or sell copies of the Materials, and to
   2.121 + permit persons to whom the Materials are furnished to do so, subject to
   2.122 + the following conditions:
   2.123 +
   2.124 + The above copyright notice and this permission notice shall be included
   2.125 + in all copies or substantial portions of the Materials.
   2.126 +
   2.127 + THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
   2.128 + EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
   2.129 + MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
   2.130 + IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
   2.131 + CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
   2.132 + TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
   2.133 + MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
   2.134 +
   2.135 + *****************************************************************************
   2.136  
   2.137  --- end of LICENSE ---
   2.138  
     3.1 --- a/common/autoconf/flags.m4	Wed Apr 15 11:14:57 2020 +0800
     3.2 +++ b/common/autoconf/flags.m4	Wed Apr 15 11:49:54 2020 +0800
     3.3 @@ -156,6 +156,7 @@
     3.4  
     3.5    if test "x$TOOLCHAIN_TYPE" = xgcc; then
     3.6      PICFLAG="-fPIC"
     3.7 +    PIEFLAG="-fPIE"
     3.8      C_FLAG_REORDER=''
     3.9      CXX_FLAG_REORDER=''
    3.10  
    3.11 @@ -176,6 +177,7 @@
    3.12      fi
    3.13    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
    3.14      PICFLAG="-KPIC"
    3.15 +    PIEFLAG=""
    3.16      C_FLAG_REORDER='-xF'
    3.17      CXX_FLAG_REORDER='-xF'
    3.18      SHARED_LIBRARY_FLAGS="-G"
    3.19 @@ -185,6 +187,7 @@
    3.20      SET_SHARED_LIBRARY_MAPFILE='-M[$]1'
    3.21    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
    3.22      PICFLAG="-qpic=large"
    3.23 +    PIEFLAG=""
    3.24      C_FLAG_REORDER=''
    3.25      CXX_FLAG_REORDER=''
    3.26      SHARED_LIBRARY_FLAGS="-qmkshrobj"
    3.27 @@ -194,6 +197,7 @@
    3.28      SET_SHARED_LIBRARY_MAPFILE=''
    3.29    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
    3.30      PICFLAG=""
    3.31 +    PIEFLAG=""
    3.32      C_FLAG_REORDER=''
    3.33      CXX_FLAG_REORDER=''
    3.34      SHARED_LIBRARY_FLAGS="-LD"
    3.35 @@ -414,6 +418,11 @@
    3.36      AC_MSG_WARN([Ignoring LDFLAGS($LDFLAGS) found in environment. Use --with-extra-ldflags])
    3.37    fi
    3.38  
    3.39 +
    3.40 +  if test "x$ASFLAGS" != "x"; then
    3.41 +    AC_MSG_WARN([Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags])
    3.42 +  fi
    3.43 +
    3.44    AC_ARG_WITH(extra-cflags, [AS_HELP_STRING([--with-extra-cflags],
    3.45        [extra flags to be used when compiling jdk c-files])])
    3.46  
    3.47 @@ -423,6 +432,9 @@
    3.48    AC_ARG_WITH(extra-ldflags, [AS_HELP_STRING([--with-extra-ldflags],
    3.49        [extra flags to be used when linking jdk])])
    3.50  
    3.51 +  AC_ARG_WITH(extra-asflags, [AS_HELP_STRING([--with-extra-asflags],
    3.52 +      [extra flags to be passed to the assembler])])
    3.53 +
    3.54    CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
    3.55    CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
    3.56    LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
    3.57 @@ -431,10 +443,12 @@
    3.58    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
    3.59    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
    3.60    LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
    3.61 +  LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
    3.62  
    3.63    AC_SUBST(LEGACY_EXTRA_CFLAGS)
    3.64    AC_SUBST(LEGACY_EXTRA_CXXFLAGS)
    3.65    AC_SUBST(LEGACY_EXTRA_LDFLAGS)
    3.66 +  AC_SUBST(LEGACY_EXTRA_ASFLAGS)
    3.67  
    3.68    ###############################################################################
    3.69    #
    3.70 @@ -648,8 +662,8 @@
    3.71    CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
    3.72  
    3.73    # Executable flags
    3.74 -  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
    3.75 -  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
    3.76 +  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG"
    3.77 +  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG"
    3.78  
    3.79    AC_SUBST(CFLAGS_JDKLIB)
    3.80    AC_SUBST(CFLAGS_JDKEXE)
    3.81 @@ -732,6 +746,13 @@
    3.82      if test "x$OPENJDK_TARGET_OS" = xlinux; then
    3.83        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
    3.84      fi
    3.85 +    if test "x$TOOLCHAIN_TYPE" = xgcc; then
    3.86 +      # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
    3.87 +      # java heap.
    3.88 +      if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
    3.89 +        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie"
    3.90 +      fi
    3.91 +    fi
    3.92    fi
    3.93    AC_SUBST(LDFLAGS_JDKLIB)
    3.94    AC_SUBST(LDFLAGS_JDKEXE)
     4.1 --- a/common/autoconf/generated-configure.sh	Wed Apr 15 11:14:57 2020 +0800
     4.2 +++ b/common/autoconf/generated-configure.sh	Wed Apr 15 11:49:54 2020 +0800
     4.3 @@ -689,6 +689,7 @@
     4.4  FDLIBM_CFLAGS
     4.5  NO_LIFETIME_DSE_CFLAG
     4.6  NO_DELETE_NULL_POINTER_CHECKS_CFLAG
     4.7 +LEGACY_EXTRA_ASFLAGS
     4.8  LEGACY_EXTRA_LDFLAGS
     4.9  LEGACY_EXTRA_CXXFLAGS
    4.10  LEGACY_EXTRA_CFLAGS
    4.11 @@ -1088,6 +1089,7 @@
    4.12  with_extra_cflags
    4.13  with_extra_cxxflags
    4.14  with_extra_ldflags
    4.15 +with_extra_asflags
    4.16  enable_debug_symbols
    4.17  enable_zip_debug_info
    4.18  with_native_debug_symbols
    4.19 @@ -1950,6 +1952,7 @@
    4.20    --with-extra-cflags     extra flags to be used when compiling jdk c-files
    4.21    --with-extra-cxxflags   extra flags to be used when compiling jdk c++-files
    4.22    --with-extra-ldflags    extra flags to be used when linking jdk
    4.23 +  --with-extra-asflags    extra flags to be passed to the assembler
    4.24    --with-native-debug-symbols
    4.25                            set the native debug symbol configuration (none,
    4.26                            internal, external, zipped) [varying]
    4.27 @@ -4385,7 +4388,7 @@
    4.28  #CUSTOM_AUTOCONF_INCLUDE
    4.29  
    4.30  # Do not change or remove the following line, it is needed for consistency checks:
    4.31 -DATE_WHEN_GENERATED=1565358475
    4.32 +DATE_WHEN_GENERATED=1585090987
    4.33  
    4.34  ###############################################################################
    4.35  #
    4.36 @@ -19797,8 +19800,6 @@
    4.37  
    4.38    if test "x$with_cacerts_file" != x; then
    4.39      CACERTS_FILE=$with_cacerts_file
    4.40 -  else
    4.41 -    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
    4.42    fi
    4.43  
    4.44  
    4.45 @@ -41307,6 +41308,7 @@
    4.46  
    4.47    if test "x$TOOLCHAIN_TYPE" = xgcc; then
    4.48      PICFLAG="-fPIC"
    4.49 +    PIEFLAG="-fPIE"
    4.50      C_FLAG_REORDER=''
    4.51      CXX_FLAG_REORDER=''
    4.52  
    4.53 @@ -41327,6 +41329,7 @@
    4.54      fi
    4.55    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
    4.56      PICFLAG="-KPIC"
    4.57 +    PIEFLAG=""
    4.58      C_FLAG_REORDER='-xF'
    4.59      CXX_FLAG_REORDER='-xF'
    4.60      SHARED_LIBRARY_FLAGS="-G"
    4.61 @@ -41336,6 +41339,7 @@
    4.62      SET_SHARED_LIBRARY_MAPFILE='-M$1'
    4.63    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
    4.64      PICFLAG="-qpic=large"
    4.65 +    PIEFLAG=""
    4.66      C_FLAG_REORDER=''
    4.67      CXX_FLAG_REORDER=''
    4.68      SHARED_LIBRARY_FLAGS="-qmkshrobj"
    4.69 @@ -41345,6 +41349,7 @@
    4.70      SET_SHARED_LIBRARY_MAPFILE=''
    4.71    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
    4.72      PICFLAG=""
    4.73 +    PIEFLAG=""
    4.74      C_FLAG_REORDER=''
    4.75      CXX_FLAG_REORDER=''
    4.76      SHARED_LIBRARY_FLAGS="-LD"
    4.77 @@ -41571,6 +41576,12 @@
    4.78    fi
    4.79  
    4.80  
    4.81 +  if test "x$ASFLAGS" != "x"; then
    4.82 +    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&5
    4.83 +$as_echo "$as_me: WARNING: Ignoring ASFLAGS($ASFLAGS) found in environment. Use --with-extra-asflags" >&2;}
    4.84 +  fi
    4.85 +
    4.86 +
    4.87  # Check whether --with-extra-cflags was given.
    4.88  if test "${with_extra_cflags+set}" = set; then :
    4.89    withval=$with_extra_cflags;
    4.90 @@ -41591,6 +41602,13 @@
    4.91  fi
    4.92  
    4.93  
    4.94 +
    4.95 +# Check whether --with-extra-asflags was given.
    4.96 +if test "${with_extra_asflags+set}" = set; then :
    4.97 +  withval=$with_extra_asflags;
    4.98 +fi
    4.99 +
   4.100 +
   4.101    CFLAGS_JDK="${CFLAGS_JDK} $with_extra_cflags"
   4.102    CXXFLAGS_JDK="${CXXFLAGS_JDK} $with_extra_cxxflags"
   4.103    LDFLAGS_JDK="${LDFLAGS_JDK} $with_extra_ldflags"
   4.104 @@ -41599,6 +41617,8 @@
   4.105    LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS $with_extra_cflags"
   4.106    LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS $with_extra_cxxflags"
   4.107    LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS $with_extra_ldflags"
   4.108 +  LEGACY_EXTRA_ASFLAGS="$with_extra_asflags"
   4.109 +
   4.110  
   4.111  
   4.112  
   4.113 @@ -42144,8 +42164,8 @@
   4.114    CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
   4.115  
   4.116    # Executable flags
   4.117 -  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
   4.118 -  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
   4.119 +  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG"
   4.120 +  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG"
   4.121  
   4.122  
   4.123  
   4.124 @@ -42228,6 +42248,13 @@
   4.125      if test "x$OPENJDK_TARGET_OS" = xlinux; then
   4.126        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
   4.127      fi
   4.128 +    if test "x$TOOLCHAIN_TYPE" = xgcc; then
   4.129 +      # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
   4.130 +      # java heap.
   4.131 +      if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
   4.132 +        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie"
   4.133 +      fi
   4.134 +    fi
   4.135    fi
   4.136  
   4.137  
   4.138 @@ -51672,7 +51699,7 @@
   4.139      { $as_echo "$as_me:${as_lineno-$LINENO}: checking for UCRT DLL dir" >&5
   4.140  $as_echo_n "checking for UCRT DLL dir... " >&6; }
   4.141      if test "x$with_ucrt_dll_dir" != x; then
   4.142 -      if test -z "$(ls -d "$with_ucrt_dll_dir/*.dll" 2> /dev/null)"; then
   4.143 +      if test -z "$(ls -d "$with_ucrt_dll_dir/"*.dll 2> /dev/null)"; then
   4.144          { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
   4.145  $as_echo "no" >&6; }
   4.146          as_fn_error $? "Could not find any dlls in $with_ucrt_dll_dir" "$LINENO" 5
     5.1 --- a/common/autoconf/hotspot-spec.gmk.in	Wed Apr 15 11:14:57 2020 +0800
     5.2 +++ b/common/autoconf/hotspot-spec.gmk.in	Wed Apr 15 11:49:54 2020 +0800
     5.3 @@ -115,6 +115,7 @@
     5.4  				   $(NO_LIFETIME_DSE_CFLAG) $(CXXSTD_CXXFLAG)
     5.5  EXTRA_CXXFLAGS=@LEGACY_EXTRA_CXXFLAGS@
     5.6  EXTRA_LDFLAGS=@LEGACY_EXTRA_LDFLAGS@
     5.7 +EXTRA_ASFLAGS=@LEGACY_EXTRA_ASFLAGS@
     5.8  
     5.9  USE_PRECOMPILED_HEADER=@USE_PRECOMPILED_HEADER@
    5.10  
     6.1 --- a/common/autoconf/jdk-options.m4	Wed Apr 15 11:14:57 2020 +0800
     6.2 +++ b/common/autoconf/jdk-options.m4	Wed Apr 15 11:49:54 2020 +0800
     6.3 @@ -389,8 +389,6 @@
     6.4        [specify alternative cacerts file])])
     6.5    if test "x$with_cacerts_file" != x; then
     6.6      CACERTS_FILE=$with_cacerts_file
     6.7 -  else
     6.8 -    CACERTS_FILE=${SRC_ROOT}/jdk/src/share/lib/security/cacerts
     6.9    fi
    6.10    AC_SUBST(CACERTS_FILE)
    6.11  
     7.1 --- a/common/autoconf/toolchain_windows.m4	Wed Apr 15 11:14:57 2020 +0800
     7.2 +++ b/common/autoconf/toolchain_windows.m4	Wed Apr 15 11:49:54 2020 +0800
     7.3 @@ -652,7 +652,7 @@
     7.4    if test "x$USE_UCRT" = "xtrue"; then
     7.5      AC_MSG_CHECKING([for UCRT DLL dir])
     7.6      if test "x$with_ucrt_dll_dir" != x; then
     7.7 -      if test -z "$(ls -d "$with_ucrt_dll_dir/*.dll" 2> /dev/null)"; then
     7.8 +      if test -z "$(ls -d "$with_ucrt_dll_dir/"*.dll 2> /dev/null)"; then
     7.9          AC_MSG_RESULT([no])
    7.10          AC_MSG_ERROR([Could not find any dlls in $with_ucrt_dll_dir])
    7.11        else

mercurial