diff options
| author | kevinw <unknown> | 2018-11-19 14:52:55 -0800 |
|---|---|---|
| committer | Alexey Ushakov <alexey.v.ushakov@gmail.com> | 2019-02-15 10:27:50 +0300 |
| commit | 9d6bbe238b17e51e9bbd45536fabdf0b5aa9cb15 (patch) | |
| tree | 352d9b3067dac8d0756d03f647c400f1521d041e | |
| parent | bda55f26307160090eb9620e65ed962d87f09a3b (diff) | |
| download | jdk8u-9d6bbe238b17e51e9bbd45536fabdf0b5aa9cb15.tar.gz | |
8199552: Update to build scripts
Reviewed-by: jwilhelm
| -rw-r--r-- | common/autoconf/flags.m4 | 22 | ||||
| -rw-r--r-- | common/autoconf/generated-configure.sh | 26 |
2 files changed, 48 insertions, 0 deletions
diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 index ebb9303..18c2a9d 100644 --- a/common/autoconf/flags.m4 +++ b/common/autoconf/flags.m4 @@ -388,12 +388,30 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" elif test "x$TOOLCHAIN_TYPE" = xgcc; then +<<<<<<< HEAD $2CC_VER_STR=`${CC} -v 2>&1 | $GREP 'version'` $2CC_VER_NUM_MAJOR=`echo ${$2CC_VER_STR} | $GREP 'version' | $SED 's/.* version@<:@ @:>@*\(@<:@0-9@:>@*\).*/\1/'` if test \( `echo ${$2CC_VER_STR} | $GREP -c 'LLVM'` -eq "0" \) -a ${$2CC_VER_NUM_MAJOR} -lt "9" ; then $2CXXSTD_CXXFLAG="-std=gnu++98" fi +======= + case $OPENJDK_TARGET_CPU_ARCH in + x86 ) + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" + ;; + x86_64 ) + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" + ;; + esac + if test "x$OPENJDK_TARGET_OS" != xmacosx; then + LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" + LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" + fi + $2CXXSTD_CXXFLAG="-std=gnu++98" +>>>>>>> 7bed3ab... 8199552: Update to build scripts FLAGS_CXX_COMPILER_CHECK_ARGUMENTS([[$]$2CXXSTD_CXXFLAG -Werror], [], [$2CXXSTD_CXXFLAG=""]) $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} ${$2CXXSTD_CXXFLAG}" @@ -455,6 +473,10 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], ppc ) # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing ;; + x86 ) + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" + ;; * ) CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index c1b2912..18b5a80 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4342,7 +4342,11 @@ VS_SDK_PLATFORM_NAME_2017= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: +<<<<<<< HEAD DATE_WHEN_GENERATED=1542996501 +======= +DATE_WHEN_GENERATED=1542667963 +>>>>>>> 7bed3ab... 8199552: Update to build scripts ############################################################################### # @@ -41333,12 +41337,30 @@ $as_echo "$ac_cv_c_bigendian" >&6; } CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt" elif test "x$TOOLCHAIN_TYPE" = xgcc; then +<<<<<<< HEAD CC_VER_STR=`${CC} -v 2>&1 | $GREP 'version'` CC_VER_NUM_MAJOR=`echo ${CC_VER_STR} | $GREP 'version' | $SED 's/.* version[ ]*\([0-9]*\).*/\1/'` if test \( `echo ${CC_VER_STR} | $GREP -c 'LLVM'` -eq "0" \) -a ${CC_VER_NUM_MAJOR} -lt "9" ; then CXXSTD_CXXFLAG="-std=gnu++98" fi +======= + case $OPENJDK_TARGET_CPU_ARCH in + x86 ) + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" + ;; + x86_64 ) + LEGACY_EXTRA_CFLAGS="$LEGACY_EXTRA_CFLAGS -fstack-protector" + LEGACY_EXTRA_CXXFLAGS="$LEGACY_EXTRA_CXXFLAGS -fstack-protector" + ;; + esac + if test "x$OPENJDK_TARGET_OS" != xmacosx; then + LDFLAGS_JDK="$LDFLAGS_JDK -Wl,-z,relro" + LEGACY_EXTRA_LDFLAGS="$LEGACY_EXTRA_LDFLAGS -Wl,-z,relro" + fi + CXXSTD_CXXFLAG="-std=gnu++98" +>>>>>>> 7bed3ab... 8199552: Update to build scripts { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$CXXSTD_CXXFLAG -Werror\"" >&5 $as_echo_n "checking if the C++ compiler supports \"$CXXSTD_CXXFLAG -Werror\"... " >&6; } @@ -41452,6 +41474,10 @@ fi ppc ) # on ppc we don't prevent gcc to omit frame pointer nor strict-aliasing ;; + x86 ) + CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer -fstack-protector" + CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing -fstack-protector" + ;; * ) CCXXFLAGS_JDK="$CCXXFLAGS_JDK -fno-omit-frame-pointer" CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing" |