make/autoconf/flags-cflags.m4

rev 59610 : imported patch cpp14_build

*** 520,529 ****
--- 520,541 ----
      # This is the lowest bar for shared code.
      LANGSTD_CFLAGS=""
    fi
    TOOLCHAIN_CFLAGS_JDK_CONLY="$LANGSTD_CFLAGS $TOOLCHAIN_CFLAGS_JDK_CONLY"
  
+   # CXXFLAGS C++ language level for all of JDK, including Hotspot.
+   if test "x$TOOLCHAIN_TYPE" = xgcc || test "x$TOOLCHAIN_TYPE" = xclang || test "x$TOOLCHAIN_TYPE" = xxlc; then
+     LANGSTD_CXXFLAGS="-std=c++14"
+   elif test "x$TOOLCHAIN_TYPE" = xmicrosoft; then
+     LANGSTD_CXXFLAGS="-std:c++14"
+   else
+     AC_MSG_ERROR([Don't know how to enable C++14 for this toolchain])
+   fi
+   TOOLCHAIN_CFLAGS_JDK_CXXONLY="$TOOLCHAIN_CFLAGS_JDK_CXXONLY $LANGSTD_CXXFLAGS"
+   TOOLCHAIN_CFLAGS_JVM="$TOOLCHAIN_CFLAGS_JVM $LANGSTD_CXXFLAGS"
+   ADLC_LANGSTD_CXXFLAGS="$LANGSTD_CXXFLAGS"
+ 
    # CFLAGS WARNINGS STUFF
    # Set JVM_CFLAGS warning handling
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
      WARNING_CFLAGS_JDK_CONLY="$WARNINGS_ENABLE_ALL_CFLAGS"
      WARNING_CFLAGS_JDK_CXXONLY="$WARNINGS_ENABLE_ALL_CXXFLAGS"
*** 702,718 ****
      if test "x$FLAGS_CPU_ARCH" != xarm &&  test "x$FLAGS_CPU_ARCH" != xppc; then
        # for all archs except arm and ppc, prevent gcc to omit frame pointer
        $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer"
      fi
  
-     $1_CXXSTD_CXXFLAG="-std=gnu++98"
-     FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [${$1_CXXSTD_CXXFLAG}],
-         PREFIX: $3, IF_FALSE: [$1_CXXSTD_CXXFLAG=""])
-     $1_TOOLCHAIN_CFLAGS_JDK_CXXONLY="${$1_CXXSTD_CXXFLAG}"
-     $1_TOOLCHAIN_CFLAGS_JVM="${$1_TOOLCHAIN_CFLAGS_JVM} ${$1_CXXSTD_CXXFLAG}"
-     $2ADLC_CXXFLAG="${$1_CXXSTD_CXXFLAG}"
- 
    elif test "x$TOOLCHAIN_TYPE" = xclang; then
      if test "x$FLAGS_OS" = xlinux; then
        # ppc test not really needed for clang
        if test "x$FLAGS_CPU_ARCH" != xarm &&  test "x$FLAGS_CPU_ARCH" != xppc; then
          # for all archs except arm and ppc, prevent gcc to omit frame pointer
--- 714,723 ----
*** 803,813 ****
    AC_SUBST($2JVM_CFLAGS)
    AC_SUBST($2CFLAGS_JDKLIB)
    AC_SUBST($2CFLAGS_JDKEXE)
    AC_SUBST($2CXXFLAGS_JDKLIB)
    AC_SUBST($2CXXFLAGS_JDKEXE)
!   AC_SUBST($2ADLC_CXXFLAG)
  
    COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
    # Check that the compiler supports -ffp-contract=off flag
    # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
    # otherwise.
--- 808,818 ----
    AC_SUBST($2JVM_CFLAGS)
    AC_SUBST($2CFLAGS_JDKLIB)
    AC_SUBST($2CFLAGS_JDKEXE)
    AC_SUBST($2CXXFLAGS_JDKLIB)
    AC_SUBST($2CXXFLAGS_JDKEXE)
!   AC_SUBST($2ADLC_LANGSTD_CXXFLAGS)
  
    COMPILER_FP_CONTRACT_OFF_FLAG="-ffp-contract=off"
    # Check that the compiler supports -ffp-contract=off flag
    # Set FDLIBM_CFLAGS to -ffp-contract=off if it does. Empty
    # otherwise.