diff options
| author | bell-sw <liberica@bell-sw.com> | 2019-02-13 10:47:06 +0300 |
|---|---|---|
| committer | Alexey Ushakov <alexey.v.ushakov@gmail.com> | 2019-02-15 10:27:50 +0300 |
| commit | 0f29afe169229cad6210b2c74cdadef442a90cd7 (patch) | |
| tree | 9abd6ac5f8304783e1c88a135dceed24fbebc703 | |
| parent | 9d6bbe238b17e51e9bbd45536fabdf0b5aa9cb15 (diff) | |
| download | jdk8u-0f29afe169229cad6210b2c74cdadef442a90cd7.tar.gz | |
Resolved merge conflicts:
common/autoconf/flags.m4
common/autoconf/generated-configure.sh
| -rw-r--r-- | common/autoconf/flags.m4 | 4 | ||||
| -rw-r--r-- | common/autoconf/generated-configure.sh | 8 |
2 files changed, 0 insertions, 12 deletions
diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 index 18c2a9d..55b9a25 100644 --- a/common/autoconf/flags.m4 +++ b/common/autoconf/flags.m4 @@ -388,14 +388,12 @@ 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" @@ -410,8 +408,6 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], 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}" diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 18b5a80..700217c 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -4342,11 +4342,7 @@ 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 ############################################################################### # @@ -41337,14 +41333,12 @@ $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" @@ -41359,8 +41353,6 @@ $as_echo "$ac_cv_c_bigendian" >&6; } 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; } |