jdk-sandbox: comparison make/autoconf/flags-cflags.m4

equal deleted inserted replaced

-:9bc8db601fe2
+:a52bcf4118eb
 AC_DEFUN([FLAGS_SETUP_DEBUG_SYMBOLS],
 [
 # Debug symbols
 if test "x$TOOLCHAIN_TYPE" = xgcc; then
-if test "x$OPENJDK_TARGET_CPU_BITS" = "x64" && test "x$DEBUG_LEVEL" = "xfastdebug"; then
+CFLAGS_DEBUG_SYMBOLS="-g"
-CFLAGS_DEBUG_SYMBOLS="-g1"
-else
-CFLAGS_DEBUG_SYMBOLS="-g"
-fi
 elif test "x$TOOLCHAIN_TYPE" = xclang; then
 CFLAGS_DEBUG_SYMBOLS="-g"
 elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
-CFLAGS_DEBUG_SYMBOLS="-g -xs"
 # -g0 enables debug symbols without disabling inlining.
-CXXFLAGS_DEBUG_SYMBOLS="-g0 -xs"
+CFLAGS_DEBUG_SYMBOLS="-g0 -xs"
 elif test "x$TOOLCHAIN_TYPE" = xxlc; then
 CFLAGS_DEBUG_SYMBOLS="-g"
 elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-CFLAGS_DEBUG_SYMBOLS="-Zi"
+CFLAGS_DEBUG_SYMBOLS="-Z7 -d2Zi+"
 fi
-if test "x$CXXFLAGS_DEBUG_SYMBOLS" = x; then
-# If we did not specify special flags for C++, use C version
-CXXFLAGS_DEBUG_SYMBOLS="$CFLAGS_DEBUG_SYMBOLS"
-fi
 AC_SUBST(CFLAGS_DEBUG_SYMBOLS)
-AC_SUBST(CXXFLAGS_DEBUG_SYMBOLS)
-# FIXME: This was never used in the old build. What to do with it?
-if test "x$TOOLCHAIN_TYPE" = xgcc; then
-# "-Og" suppported for GCC 4.8 and later
-CFLAG_OPTIMIZE_DEBUG_FLAG="-Og"
-FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$CFLAG_OPTIMIZE_DEBUG_FLAG],
-IF_TRUE: [HAS_CFLAG_OPTIMIZE_DEBUG=true],
-IF_FALSE: [HAS_CFLAG_OPTIMIZE_DEBUG=false])
-fi
-# Debug symbols for JVM_CFLAGS
-if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
-JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS -xs"
-if test "x$DEBUG_LEVEL" = xslowdebug; then
-JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS -g"
-else
-# -g0 does not disable inlining, which -g does.
-JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS -g0"
-fi
-elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
-JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS -Z7 -d2Zi+"
-else
-JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS -g"
-fi
-AC_SUBST(JVM_CFLAGS_SYMBOLS)
 ])
 AC_DEFUN([FLAGS_SETUP_WARNINGS],
 [
 AC_ARG_ENABLE([warnings-as-errors], [AS_HELP_STRING([--disable-warnings-as-errors],
 DISABLED_WARNINGS_C="E_OLD_STYLE_FUNC_DECL E_OLD_STYLE_FUNC_DEF E_SEMANTICS_OF_OP_CHG_IN_ANSI_C E_NO_REPLACEMENT_IN_STRING E_DECLARATION_IN_CODE"
 DISABLED_WARNINGS_CXX="inllargeuse inllargeint notused wemptydecl notemsource"
 # helpful quality checks, should not be disabled: inllargeuse inllargeint
 ;;
 gcc)
-# Prior to gcc 4.4, a -Wno-X where X is unknown for that version of gcc will cause an error
+DISABLE_WARNING_PREFIX="-Wno-"
-FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [-Wno-this-is-a-warning-that-do-not-exist],
-IF_TRUE: [GCC_CAN_DISABLE_WARNINGS=true],
-IF_FALSE: [GCC_CAN_DISABLE_WARNINGS=false]
-)
-if test "x$GCC_CAN_DISABLE_WARNINGS" = "xtrue"; then
-DISABLE_WARNING_PREFIX="-Wno-"
-else
-DISABLE_WARNING_PREFIX=
-fi
 CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
 # -Wall -Wextra does not enable all warnings. We add some more that we
 # consider relevant:
 WARNINGS_ENABLE_ADDITIONAL="-Wpointer-arith -Wundef -Wlogical-op -Winit-self -Wpacked -Wdisabled-optimization -Wtrampolines"
 CXX_OLD="$CXX"
 CC="$BUILD_CC"
 CXX="$BUILD_CXX"
 CFLAGS_OLD="$CFLAGS"
 CFLAGS=""
-FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [-Wno-this-is-a-warning-that-do-not-exist],
+BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
-IF_TRUE: [BUILD_CC_CAN_DISABLE_WARNINGS=true],
-IF_FALSE: [BUILD_CC_CAN_DISABLE_WARNINGS=false]
-)
-if test "x$BUILD_CC_CAN_DISABLE_WARNINGS" = "xtrue"; then
-BUILD_CC_DISABLE_WARNING_PREFIX="-Wno-"
-else
-BUILD_CC_DISABLE_WARNING_PREFIX=
-fi
 CC="$CC_OLD"
 CXX="$CXX_OLD"
 CFLAGS="$CFLAGS_OLD"
 ;;
 clang)
 # FIXME: By adding this to C(XX)FLAGS_DEBUG_OPTIONS/JVM_CFLAGS_SYMBOLS it
 # get's added conditionally on whether we produce debug symbols or not.
 # This is most likely not really correct.
 # Add runtime stack smashing and undefined behavior checks.
-# Not all versions of gcc support -fstack-protector
+CFLAGS_DEBUG_OPTIONS="-fstack-protector-all --param ssp-buffer-size=1 -Wstack-protector"
-STACK_PROTECTOR_CFLAG="-fstack-protector-all"
+CXXFLAGS_DEBUG_OPTIONS="-fstack-protector-all --param ssp-buffer-size=1 -Wstack-protector"
-FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$STACK_PROTECTOR_CFLAG -Werror],
-IF_FALSE: [STACK_PROTECTOR_CFLAG=""])
+JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS -fstack-protector-all --param ssp-buffer-size=1 -Wstack-protector"
-CFLAGS_DEBUG_OPTIONS="$STACK_PROTECTOR_CFLAG --param ssp-buffer-size=1 -Wstack-protector"
-CXXFLAGS_DEBUG_OPTIONS="$STACK_PROTECTOR_CFLAG --param ssp-buffer-size=1 -Wstack-protector"
-if test "x$STACK_PROTECTOR_CFLAG" != x; then
-JVM_CFLAGS_SYMBOLS="$JVM_CFLAGS_SYMBOLS $STACK_PROTECTOR_CFLAG --param ssp-buffer-size=1 -Wstack-protector"
-fi
 ;;
 esac
 fi
 ])
 fi
 if test "x$DEBUG_LEVEL" != xrelease; then
 DEBUG_OPTIONS_FLAGS_JDK="$CFLAGS_DEBUG_OPTIONS"
 DEBUG_SYMBOLS_CFLAGS_JDK="$CFLAGS_DEBUG_SYMBOLS"
-DEBUG_SYMBOLS_CXXFLAGS_JDK="$CXXFLAGS_DEBUG_SYMBOLS"
 fi
 #### TOOLCHAIN DEFINES
 if test "x$TOOLCHAIN_TYPE" = xgcc; then
 TOOLCHAIN_CFLAGS_JDK="-mt $TOOLCHAIN_FLAGS"
 TOOLCHAIN_CFLAGS_JDK_CONLY="-xc99=%none -xCC -Xa -W0,-noglobal $TOOLCHAIN_CFLAGS" # C only
 TOOLCHAIN_CFLAGS_JDK_CXXONLY="-features=no%except -norunpath -xnolib" # CXX only
 TOOLCHAIN_CFLAGS_JVM="-template=no%extdef -features=no%split_init \
 -library=stlport4 -mt -features=no%except $TOOLCHAIN_FLAGS"
+if test "x$DEBUG_LEVEL" = xslowdebug; then
+# Previously -g was used instead of -g0 for slowdebug; this is equivalent
+# to setting +d.
+TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM +d"
+fi
 elif test "x$TOOLCHAIN_TYPE" = xxlc; then
 TOOLCHAIN_CFLAGS_JDK="-qchars=signed -qfullpath -qsaveopt"  # add on both CFLAGS
 TOOLCHAIN_CFLAGS_JVM="-qtune=balanced \
 -qalias=noansi -qstrict -qtls=default -qlanglvl=c99vla \
 -qlanglvl=noredefmac -qnortti -qnoeh -qignerrno"
 if test "x$TOOLCHAIN_TYPE" = xgcc; then
 TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: 6, PREFIX: $2, IF_AT_LEAST: FLAGS_SETUP_GCC6_COMPILER_FLAGS($1))
 $1_TOOLCHAIN_CFLAGS="${$1_GCC6_CFLAGS}"
-TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: [4.8], PREFIX: $2,
+$1_WARNING_CFLAGS_JVM="-Wno-format-zero-length -Wtype-limits -Wuninitialized"
-IF_AT_LEAST: [
-# These flags either do not work or give spurious warnings prior to gcc 4.8.
-$1_WARNING_CFLAGS_JVM="-Wno-format-zero-length -Wtype-limits -Wuninitialized"
-]
-)
 fi
 # EXPORT to API
 CFLAGS_JVM_COMMON="$ALWAYS_CFLAGS_JVM $ALWAYS_DEFINES_JVM $TOOLCHAIN_CFLAGS_JVM \
 $OS_CFLAGS $OS_CFLAGS_JVM $CFLAGS_OS_DEF_JVM $DEBUG_CFLAGS_JVM \
 $WARNING_CFLAGS $WARNING_CFLAGS_JVM $JVM_PICFLAG"
 CFLAGS_JDK_COMMON="$ALWAYS_CFLAGS_JDK $ALWAYS_DEFINES_JDK $TOOLCHAIN_CFLAGS_JDK \
 $OS_CFLAGS $CFLAGS_OS_DEF_JDK $DEBUG_CFLAGS_JDK $DEBUG_OPTIONS_FLAGS_JDK \
-$WARNING_CFLAGS $WARNING_CFLAGS_JDK"
+$WARNING_CFLAGS $WARNING_CFLAGS_JDK $DEBUG_SYMBOLS_CFLAGS_JDK"
 # Use ${$2EXTRA_CFLAGS} to block EXTRA_CFLAGS to be added to build flags.
 # (Currently we don't have any OPENJDK_BUILD_EXTRA_CFLAGS, but that might
 # change in the future.)
-CFLAGS_JDK_COMMON_CONLY="$TOOLCHAIN_CFLAGS_JDK_CONLY $DEBUG_SYMBOLS_CFLAGS_JDK \
+CFLAGS_JDK_COMMON_CONLY="$TOOLCHAIN_CFLAGS_JDK_CONLY  \
 $WARNING_CFLAGS_JDK_CONLY ${$2EXTRA_CFLAGS}"
 CFLAGS_JDK_COMMON_CXXONLY="$ALWAYS_DEFINES_JDK_CXXONLY $TOOLCHAIN_CFLAGS_JDK_CXXONLY \
-$DEBUG_SYMBOLS_CXXFLAGS_JDK $WARNING_CFLAGS_JDK_CXXONLY ${$2EXTRA_CXXFLAGS}"
+$WARNING_CFLAGS_JDK_CXXONLY ${$2EXTRA_CXXFLAGS}"
 $1_CFLAGS_JVM="${$1_DEFINES_CPU_JVM} ${$1_CFLAGS_CPU} ${$1_CFLAGS_CPU_JVM} ${$1_TOOLCHAIN_CFLAGS} ${$1_WARNING_CFLAGS_JVM}"
 $1_CFLAGS_JDK="${$1_DEFINES_CPU_JDK} ${$1_CFLAGS_CPU} ${$1_CFLAGS_CPU_JDK} ${$1_TOOLCHAIN_CFLAGS}"
 $2JVM_CFLAGS="$CFLAGS_JVM_COMMON ${$1_CFLAGS_JVM} ${$2EXTRA_CXXFLAGS}"

branch	ihse-cflags-rewrite-branch
changeset 56312	a52bcf4118eb
parent 56250	d64ab781c927
parent 49200	a19a6228cdb2
child 56726	3a9b7a1f9197