Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/.hgtags	Tue Apr 21 12:00:59 2020 +0200
     1.2 +++ b/.hgtags	Fri Apr 24 03:58:32 2020 +0100
     1.3 @@ -998,3 +998,5 @@
     1.4  bb464170d34478503661419d2f2864af7553d696 jdk8u252-b06
     1.5  746815de8b5b0c661aa6a1fa9476be758cc51e17 jdk8u252-b07
     1.6  72a6d93679e5bee5d5192234b8421024233cf616 jdk8u252-b08
     1.7 +343c4ea489d5d3b058c5e00339868e4f66c4995a jdk8u252-b09
     1.8 +343c4ea489d5d3b058c5e00339868e4f66c4995a jdk8u252-ga

     2.1 --- a/common/autoconf/flags.m4	Tue Apr 21 12:00:59 2020 +0200
     2.2 +++ b/common/autoconf/flags.m4	Fri Apr 24 03:58:32 2020 +0100
     2.3 @@ -156,6 +156,7 @@
     2.4  
     2.5    if test "x$TOOLCHAIN_TYPE" = xgcc; then
     2.6      PICFLAG="-fPIC"
     2.7 +    PIEFLAG="-fPIE"
     2.8      C_FLAG_REORDER=''
     2.9      CXX_FLAG_REORDER=''
    2.10  
    2.11 @@ -176,6 +177,7 @@
    2.12      fi
    2.13    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
    2.14      PICFLAG="-KPIC"
    2.15 +    PIEFLAG=""
    2.16      C_FLAG_REORDER='-xF'
    2.17      CXX_FLAG_REORDER='-xF'
    2.18      SHARED_LIBRARY_FLAGS="-G"
    2.19 @@ -185,6 +187,7 @@
    2.20      SET_SHARED_LIBRARY_MAPFILE='-M[$]1'
    2.21    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
    2.22      PICFLAG="-qpic=large"
    2.23 +    PIEFLAG=""
    2.24      C_FLAG_REORDER=''
    2.25      CXX_FLAG_REORDER=''
    2.26      SHARED_LIBRARY_FLAGS="-qmkshrobj"
    2.27 @@ -194,6 +197,7 @@
    2.28      SET_SHARED_LIBRARY_MAPFILE=''
    2.29    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
    2.30      PICFLAG=""
    2.31 +    PIEFLAG=""
    2.32      C_FLAG_REORDER=''
    2.33      CXX_FLAG_REORDER=''
    2.34      SHARED_LIBRARY_FLAGS="-LD"
    2.35 @@ -658,8 +662,8 @@
    2.36    CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
    2.37  
    2.38    # Executable flags
    2.39 -  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
    2.40 -  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
    2.41 +  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG"
    2.42 +  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG"
    2.43  
    2.44    AC_SUBST(CFLAGS_JDKLIB)
    2.45    AC_SUBST(CFLAGS_JDKEXE)
    2.46 @@ -742,6 +746,13 @@
    2.47      if test "x$OPENJDK_TARGET_OS" = xlinux; then
    2.48        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
    2.49      fi
    2.50 +    if test "x$TOOLCHAIN_TYPE" = xgcc; then
    2.51 +      # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
    2.52 +      # java heap.
    2.53 +      if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
    2.54 +        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie"
    2.55 +      fi
    2.56 +    fi
    2.57    fi
    2.58    AC_SUBST(LDFLAGS_JDKLIB)
    2.59    AC_SUBST(LDFLAGS_JDKEXE)

     3.1 --- a/common/autoconf/generated-configure.sh	Tue Apr 21 12:00:59 2020 +0200
     3.2 +++ b/common/autoconf/generated-configure.sh	Fri Apr 24 03:58:32 2020 +0100
     3.3 @@ -3927,7 +3927,7 @@
     3.4  
     3.5  
     3.6  #
     3.7 -# Copyright (c) 2011, 2019, Oracle and/or its affiliates. All rights reserved.
     3.8 +# Copyright (c) 2011, 2020, Oracle and/or its affiliates. All rights reserved.
     3.9  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    3.10  #
    3.11  # This code is free software; you can redistribute it and/or modify it
    3.12 @@ -4394,7 +4394,7 @@
    3.13  #CUSTOM_AUTOCONF_INCLUDE
    3.14  
    3.15  # Do not change or remove the following line, it is needed for consistency checks:
    3.16 -DATE_WHEN_GENERATED=1585655585
    3.17 +DATE_WHEN_GENERATED=1587694859
    3.18  
    3.19  ###############################################################################
    3.20  #
    3.21 @@ -41281,6 +41281,7 @@
    3.22  
    3.23    if test "x$TOOLCHAIN_TYPE" = xgcc; then
    3.24      PICFLAG="-fPIC"
    3.25 +    PIEFLAG="-fPIE"
    3.26      C_FLAG_REORDER=''
    3.27      CXX_FLAG_REORDER=''
    3.28  
    3.29 @@ -41301,6 +41302,7 @@
    3.30      fi
    3.31    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
    3.32      PICFLAG="-KPIC"
    3.33 +    PIEFLAG=""
    3.34      C_FLAG_REORDER='-xF'
    3.35      CXX_FLAG_REORDER='-xF'
    3.36      SHARED_LIBRARY_FLAGS="-G"
    3.37 @@ -41310,6 +41312,7 @@
    3.38      SET_SHARED_LIBRARY_MAPFILE='-M$1'
    3.39    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
    3.40      PICFLAG="-qpic=large"
    3.41 +    PIEFLAG=""
    3.42      C_FLAG_REORDER=''
    3.43      CXX_FLAG_REORDER=''
    3.44      SHARED_LIBRARY_FLAGS="-qmkshrobj"
    3.45 @@ -41319,6 +41322,7 @@
    3.46      SET_SHARED_LIBRARY_MAPFILE=''
    3.47    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
    3.48      PICFLAG=""
    3.49 +    PIEFLAG=""
    3.50      C_FLAG_REORDER=''
    3.51      CXX_FLAG_REORDER=''
    3.52      SHARED_LIBRARY_FLAGS="-LD"
    3.53 @@ -42133,8 +42137,8 @@
    3.54    CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
    3.55  
    3.56    # Executable flags
    3.57 -  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
    3.58 -  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
    3.59 +  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG"
    3.60 +  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG"
    3.61  
    3.62  
    3.63  
    3.64 @@ -42217,6 +42221,13 @@
    3.65      if test "x$OPENJDK_TARGET_OS" = xlinux; then
    3.66        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
    3.67      fi
    3.68 +    if test "x$TOOLCHAIN_TYPE" = xgcc; then
    3.69 +      # Enabling pie on 32 bit builds prevents the JVM from allocating a continuous
    3.70 +      # java heap.
    3.71 +      if test "x$OPENJDK_TARGET_CPU_BITS" != "x32"; then
    3.72 +        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie"
    3.73 +      fi
    3.74 +    fi
    3.75    fi
    3.76  
    3.77