Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/flags.m4	Fri Mar 27 05:14:05 2020 +0000
     1.2 +++ b/common/autoconf/flags.m4	Mon Apr 06 01:58:35 2020 +0100
     1.3 @@ -156,6 +156,7 @@
     1.4  
     1.5    if test "x$TOOLCHAIN_TYPE" = xgcc; then
     1.6      PICFLAG="-fPIC"
     1.7 +    PIEFLAG="-fPIE"
     1.8      C_FLAG_REORDER=''
     1.9      CXX_FLAG_REORDER=''
    1.10  
    1.11 @@ -176,6 +177,7 @@
    1.12      fi
    1.13    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
    1.14      PICFLAG="-KPIC"
    1.15 +    PIEFLAG=""
    1.16      C_FLAG_REORDER='-xF'
    1.17      CXX_FLAG_REORDER='-xF'
    1.18      SHARED_LIBRARY_FLAGS="-G"
    1.19 @@ -185,6 +187,7 @@
    1.20      SET_SHARED_LIBRARY_MAPFILE='-M[$]1'
    1.21    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
    1.22      PICFLAG="-qpic=large"
    1.23 +    PIEFLAG=""
    1.24      C_FLAG_REORDER=''
    1.25      CXX_FLAG_REORDER=''
    1.26      SHARED_LIBRARY_FLAGS="-qmkshrobj"
    1.27 @@ -194,6 +197,7 @@
    1.28      SET_SHARED_LIBRARY_MAPFILE=''
    1.29    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
    1.30      PICFLAG=""
    1.31 +    PIEFLAG=""
    1.32      C_FLAG_REORDER=''
    1.33      CXX_FLAG_REORDER=''
    1.34      SHARED_LIBRARY_FLAGS="-LD"
    1.35 @@ -658,8 +662,8 @@
    1.36    CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
    1.37  
    1.38    # Executable flags
    1.39 -  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
    1.40 -  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
    1.41 +  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG"
    1.42 +  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG"
    1.43  
    1.44    AC_SUBST(CFLAGS_JDKLIB)
    1.45    AC_SUBST(CFLAGS_JDKEXE)
    1.46 @@ -742,6 +746,9 @@
    1.47      if test "x$OPENJDK_TARGET_OS" = xlinux; then
    1.48        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
    1.49      fi
    1.50 +    if test "x$TOOLCHAIN_TYPE" = xgcc; then
    1.51 +      LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie"
    1.52 +    fi
    1.53    fi
    1.54    AC_SUBST(LDFLAGS_JDKLIB)
    1.55    AC_SUBST(LDFLAGS_JDKEXE)

     2.1 --- a/common/autoconf/generated-configure.sh	Fri Mar 27 05:14:05 2020 +0000
     2.2 +++ b/common/autoconf/generated-configure.sh	Mon Apr 06 01:58:35 2020 +0100
     2.3 @@ -4379,7 +4379,7 @@
     2.4  #CUSTOM_AUTOCONF_INCLUDE
     2.5  
     2.6  # Do not change or remove the following line, it is needed for consistency checks:
     2.7 -DATE_WHEN_GENERATED=1580709484
     2.8 +DATE_WHEN_GENERATED=1585090811
     2.9  
    2.10  ###############################################################################
    2.11  #
    2.12 @@ -41236,6 +41236,7 @@
    2.13  
    2.14    if test "x$TOOLCHAIN_TYPE" = xgcc; then
    2.15      PICFLAG="-fPIC"
    2.16 +    PIEFLAG="-fPIE"
    2.17      C_FLAG_REORDER=''
    2.18      CXX_FLAG_REORDER=''
    2.19  
    2.20 @@ -41256,6 +41257,7 @@
    2.21      fi
    2.22    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
    2.23      PICFLAG="-KPIC"
    2.24 +    PIEFLAG=""
    2.25      C_FLAG_REORDER='-xF'
    2.26      CXX_FLAG_REORDER='-xF'
    2.27      SHARED_LIBRARY_FLAGS="-G"
    2.28 @@ -41265,6 +41267,7 @@
    2.29      SET_SHARED_LIBRARY_MAPFILE='-M$1'
    2.30    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
    2.31      PICFLAG="-qpic=large"
    2.32 +    PIEFLAG=""
    2.33      C_FLAG_REORDER=''
    2.34      CXX_FLAG_REORDER=''
    2.35      SHARED_LIBRARY_FLAGS="-qmkshrobj"
    2.36 @@ -41274,6 +41277,7 @@
    2.37      SET_SHARED_LIBRARY_MAPFILE=''
    2.38    elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
    2.39      PICFLAG=""
    2.40 +    PIEFLAG=""
    2.41      C_FLAG_REORDER=''
    2.42      CXX_FLAG_REORDER=''
    2.43      SHARED_LIBRARY_FLAGS="-LD"
    2.44 @@ -42088,8 +42092,8 @@
    2.45    CXXFLAGS_JDKLIB="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PICFLAG $CXXFLAGS_JDKLIB_EXTRA "
    2.46  
    2.47    # Executable flags
    2.48 -  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK"
    2.49 -  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK"
    2.50 +  CFLAGS_JDKEXE="$CCXXFLAGS_JDK $CFLAGS_JDK $PIEFLAG"
    2.51 +  CXXFLAGS_JDKEXE="$CCXXFLAGS_JDK $CXXFLAGS_JDK $PIEFLAG"
    2.52  
    2.53  
    2.54  
    2.55 @@ -42172,6 +42176,9 @@
    2.56      if test "x$OPENJDK_TARGET_OS" = xlinux; then
    2.57        LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -Xlinker --allow-shlib-undefined"
    2.58      fi
    2.59 +    if test "x$TOOLCHAIN_TYPE" = xgcc; then
    2.60 +      LDFLAGS_JDKEXE="$LDFLAGS_JDKEXE -pie"
    2.61 +    fi
    2.62    fi
    2.63  
    2.64