1.1 --- a/common/autoconf/flags.m4 Sat Nov 09 20:15:27 2019 +0800
1.2 +++ b/common/autoconf/flags.m4 Sat Nov 09 20:29:44 2019 +0800
1.3 @@ -388,16 +388,8 @@
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 + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector"
1.18 + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector"
1.19 if test "x$OPENJDK_TARGET_OS" != xmacosx; then
1.20 LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro"
1.21 LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro"
1.22 @@ -456,7 +448,7 @@
1.23 if test "x$TOOLCHAIN_TYPE" = xgcc; then
1.24 # these options are used for both C and C++ compiles
1.25 CCXXFLAGS_JDK="$CCXXFLAGS $CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \
1.26 - -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
1.27 + -pipe -fstack-protector -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
1.28 case $OPENJDK_TARGET_CPU_ARCH in
1.29 arm )
1.30 # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
1.31 @@ -465,10 +457,6 @@
1.32 ppc )
1.33 # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing
1.34 ;;
1.35 - x86 )
1.36 - CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector"
1.37 - CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector"
1.38 - ;;
1.39 * )
1.40 CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer"
1.41 CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
