1.1 --- a/common/autoconf/generated-configure.sh Tue Nov 27 10:22:00 2018 -0800
1.2 +++ b/common/autoconf/generated-configure.sh Mon Nov 19 14:52:55 2018 -0800
1.3 @@ -4336,7 +4336,7 @@
1.4 #CUSTOM_AUTOCONF_INCLUDE
1.5
1.6 # Do not change or remove the following line, it is needed for consistency checks:
1.7 -DATE_WHEN_GENERATED=1536764960
1.8 +DATE_WHEN_GENERATED=1542667963
1.9
1.10 ###############################################################################
1.11 #
1.12 @@ -41309,6 +41309,20 @@
1.13 CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.14 CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
1.15 elif test "x$TOOLCHAIN_TYPE" = xgcc; then
1.16 + case $OPENJDK_TARGET_CPU_ARCH in
1.17 + x86 )
1.18 + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
1.19 + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
1.20 + ;;
1.21 + x86_64 )
1.22 + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
1.23 + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
1.24 + ;;
1.25 + esac
1.26 + if test "x$OPENJDK_TARGET_OS" != xmacosx; then
1.27 + LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
1.28 + LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
1.29 + fi
1.30 CXXSTD_CXXFLAG="-std=gnu++98"
1.31
1.32 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$CXXSTD_CXXFLAG -Werror\"" >&5
1.33 @@ -41423,6 +41437,10 @@
1.34 ppc )
1.35 # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
1.36 ;;
1.37 + x86 )
1.38 + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector"
1.39 + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector"
1.40 + ;;
1.41 * )
1.42 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"
1.43 CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
