Mercurial > jdk8-mips64-public / changeset

     1.1 --- a/common/autoconf/flags.m4	Tue Nov 27 10:22:00 2018 -0800
     1.2 +++ b/common/autoconf/flags.m4	Mon Nov 19 14:52:55 2018 -0800
     1.3 @@ -381,6 +381,20 @@
     1.4      CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
     1.5      CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
     1.6    elif test "x$TOOLCHAIN_TYPE" = xgcc; then
     1.7 +    case $OPENJDK_TARGET_CPU_ARCH in
     1.8 +    x86 )
     1.9 +      LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
    1.10 +      LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
    1.11 +      ;;
    1.12 +    x86_64 )
    1.13 +      LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
    1.14 +      LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
    1.15 +      ;;
    1.16 +    esac
    1.17 +    if test "x$OPENJDK_TARGET_OS" != xmacosx; then
    1.18 +      LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
    1.19 +      LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
    1.20 +    fi
    1.21      $2CXXSTD_CXXFLAG="-std=gnu++98"
    1.22      FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]$2CXXSTD_CXXFLAG -Werror],
    1.23                                         [], [$2CXXSTD_CXXFLAG=""])
    1.24 @@ -443,6 +457,10 @@
    1.25        ppc )
    1.26          # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
    1.27          ;;
    1.28 +      x86 )
    1.29 +        CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector"
    1.30 +        CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector"
    1.31 +        ;;
    1.32        * )
    1.33          CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"
    1.34          CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"

     2.1 --- a/common/autoconf/generated-configure.sh	Tue Nov 27 10:22:00 2018 -0800
     2.2 +++ b/common/autoconf/generated-configure.sh	Mon Nov 19 14:52:55 2018 -0800
     2.3 @@ -4336,7 +4336,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=1536764960
     2.8 +DATE_WHEN_GENERATED=1542667963
     2.9  
    2.10  ###############################################################################
    2.11  #
    2.12 @@ -41309,6 +41309,20 @@
    2.13      CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
    2.14      CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
    2.15    elif test "x$TOOLCHAIN_TYPE" = xgcc; then
    2.16 +    case $OPENJDK_TARGET_CPU_ARCH in
    2.17 +    x86 )
    2.18 +      LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
    2.19 +      LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
    2.20 +      ;;
    2.21 +    x86_64 )
    2.22 +      LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
    2.23 +      LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
    2.24 +      ;;
    2.25 +    esac
    2.26 +    if test "x$OPENJDK_TARGET_OS" != xmacosx; then
    2.27 +      LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
    2.28 +      LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
    2.29 +    fi
    2.30      CXXSTD_CXXFLAG="-std=gnu++98"
    2.31  
    2.32    { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$CXXSTD_CXXFLAG -Werror\"" >&5
    2.33 @@ -41423,6 +41437,10 @@
    2.34        ppc )
    2.35          # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
    2.36          ;;
    2.37 +      x86 )
    2.38 +        CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector"
    2.39 +        CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector"
    2.40 +        ;;
    2.41        * )
    2.42          CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"
    2.43          CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"