common/autoconf/flags.m4

*** 1,7 ****
  #
! # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
--- 1,7 ----
  #
! # Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
  # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  #
  # This code is free software; you can redistribute it and/or modify it
  # under the terms of the GNU General Public License version 2 only, as
  # published by the Free Software Foundation.  Oracle designates this
*** 476,485 ****
--- 476,487 ----
    if test "x$TOOLCHAIN_TYPE" = xsolstudio; then
      if test "x$OPENJDK_TARGET_CPU_ARCH" = "xsparc"; then
        CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
        CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -xregs=no%appl"
      fi
+     CFLAGS_JDKLIB_EXTRA="${CFLAGS_JDKLIB_EXTRA} -errtags=yes -errfmt"
+     CXXFLAGS_JDKLIB_EXTRA="${CXXFLAGS_JDKLIB_EXTRA} -errtags=yes -errfmt"
    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
      LDFLAGS_JDK="${LDFLAGS_JDK} -q64 -brtl -bnolibpath -liconv -bexpall"
      CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
      CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -q64 -qfullpath -qsaveopt"
    fi
*** 527,537 ****
    # Setup compiler/platform specific flags into
    #    CFLAGS_JDK    - C Compiler flags
    #    CXXFLAGS_JDK  - C++ Compiler flags
    #    COMMON_CCXXFLAGS_JDK - common to C and C++
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
!     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -Wall -Wno-parentheses -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \
          -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
      case $OPENJDK_TARGET_CPU_ARCH in
        arm )
          # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
          CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
--- 529,539 ----
    # Setup compiler/platform specific flags into
    #    CFLAGS_JDK    - C Compiler flags
    #    CXXFLAGS_JDK  - C++ Compiler flags
    #    COMMON_CCXXFLAGS_JDK - common to C and C++
    if test "x$TOOLCHAIN_TYPE" = xgcc; then
!     COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -Wall -Wextra -Wno-unused -Wno-unused-parameter -Wformat=2 \
          -pipe -D_GNU_SOURCE -D_REENTRANT -D_LARGEFILE64_SOURCE"
      case $OPENJDK_TARGET_CPU_ARCH in
        arm )
          # on arm we don't prevent gcc to omit frame pointer but do prevent strict aliasing
          CFLAGS_JDK="${CFLAGS_JDK} -fno-strict-aliasing"
*** 547,557 ****
      esac
    elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then
      COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS $COMMON_CCXXFLAGS_JDK -DTRACING -DMACRO_MEMSYS_OPS -DBREAKPTS"
      if test "x$OPENJDK_TARGET_CPU_ARCH" = xx86; then
        COMMON_CCXXFLAGS_JDK="$COMMON_CCXXFLAGS_JDK -DcpuIntel -Di586 -D$OPENJDK_TARGET_CPU_LEGACY_LIB"
-       CFLAGS_JDK="$CFLAGS_JDK -erroff=E_BAD_PRAGMA_PACK_VALUE"
      fi
  
      CFLAGS_JDK="$CFLAGS_JDK -xc99=%none -xCC -errshort=tags -Xa -v -mt -W0,-noglobal"
      CXXFLAGS_JDK="$CXXFLAGS_JDK -errtags=yes +w -mt -features=no%except -DCC_NOEX -norunpath -xnolib"
    elif test "x$TOOLCHAIN_TYPE" = xxlc; then
--- 549,558 ----
*** 881,899 ****
--- 882,914 ----
        [COMPILER_SUPPORTS_TARGET_BITS_FLAG=false])
    AC_SUBST(COMPILER_SUPPORTS_TARGET_BITS_FLAG)
  
    case "${TOOLCHAIN_TYPE}" in
      microsoft)
+       DISABLE_WARNING_PREFIX="-wd"
        CFLAGS_WARNINGS_ARE_ERRORS="-WX"
        ;;
      solstudio)
+       DISABLE_WARNING_PREFIX="-erroff="
        CFLAGS_WARNINGS_ARE_ERRORS="-errtags -errwarn=%all"
        ;;
      gcc)
+       # Prior to gcc 4.4, a -Wno-X where X is unknown for that version of gcc will cause an error
+       AC_MSG_CHECKING([if gcc can disable warnings])
+       GCC_CAN_DISABLE_WARNINGS=`$ECHO $CC_VERSION_NUMBER | $GREP -e  '^4\.[[4-9]]' -e '^[[5-9]]'`
+       if test "x$GCC_CAN_DISABLE_WARNINGS" != "x"; then
+         DISABLE_WARNING_PREFIX="-Wno-"
+         AC_MSG_RESULT([yes])
+       else
+         DISABLE_WARNING_PREFIX=
+         AC_MSG_RESULT([no])
+       fi
        CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
        ;;
      clang)
+       DISABLE_WARNING_PREFIX="-Wno-"
        CFLAGS_WARNINGS_ARE_ERRORS="-Werror"
        ;;
    esac
+   AC_SUBST(DISABLE_WARNING_PREFIX)
    AC_SUBST(CFLAGS_WARNINGS_ARE_ERRORS)
  ])