X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fpandora_warnings.m4;h=eb0f7b4cf7334196986c20528ecb7db4889ea347;hb=1d8231fc194a56976c5bb14a75ff548ef5440191;hp=2af759a401bc86423df07510ee57b70602f7e6f5;hpb=daae2d944f6f7763ec6d69d0016d10efb5fdc0ed;p=awesomized%2Flibmemcached diff --git a/m4/pandora_warnings.m4 b/m4/pandora_warnings.m4 index 2af759a4..eb0f7b4c 100644 --- a/m4/pandora_warnings.m4 +++ b/m4/pandora_warnings.m4 @@ -13,7 +13,9 @@ dnl allow it AC_DEFUN([PANDORA_WARNINGS],[ m4_define([PW_LESS_WARNINGS],[no]) m4_define([PW_WARN_ALWAYS_ON],[no]) - m4_foreach_w([pw_arg],$@,[ + ifdef([m4_define],,[define([m4_define], defn([define]))]) + ifdef([m4_undefine],,[define([m4_undefine], defn([undefine]))]) + m4_foreach([pw_arg],[$*],[ m4_case(pw_arg, [less-warnings],[ m4_undefine([PW_LESS_WARNINGS]) @@ -48,6 +50,7 @@ AC_DEFUN([PANDORA_WARNINGS],[ AS_IF([test "$ac_profiling" = "yes"],[ CC_PROFILING="-pg" + GCOV_LIBS="-pg -lgcov" save_LIBS="${LIBS}" LIBS="" AC_CHECK_LIB(c_p, read) @@ -59,7 +62,12 @@ AC_DEFUN([PANDORA_WARNINGS],[ ]) AS_IF([test "$ac_coverage" = "yes"], - [CC_COVERAGE="-fprofile-arcs -ftest-coverage"]) + [ + CC_COVERAGE="--coverage" + GCOV_LIBS="-lgcov" + ]) + + AS_IF([test "$ac_cv_warnings_as_errors" = "yes"], [W_FAIL="-Werror"]) @@ -67,7 +75,7 @@ AC_DEFUN([PANDORA_WARNINGS],[ AC_CACHE_CHECK([whether it is safe to use -fdiagnostics-show-option], [ac_cv_safe_to_use_fdiagnostics_show_option_], [save_CFLAGS="$CFLAGS" - CFLAGS="-fdiagnostics-show-option ${AM_CFLAGS}" + CFLAGS="-fdiagnostics-show-option ${AM_CFLAGS} ${CFLAGS}" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([],[])], [ac_cv_safe_to_use_fdiagnostics_show_option_=yes], @@ -84,7 +92,7 @@ AC_DEFUN([PANDORA_WARNINGS],[ [save_CFLAGS="$CFLAGS" dnl Use -Werror here instead of ${W_FAIL} so that we don't spew dnl conversion warnings to all the tarball folks - CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS}" + CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS} ${CFLAGS}" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[ #include @@ -106,7 +114,7 @@ foo(0); [save_CFLAGS="$CFLAGS" dnl Use -Werror here instead of ${W_FAIL} so that we don't spew dnl conversion warnings to all the tarball folks - CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS}" + CFLAGS="-Wconversion -Werror -pedantic ${AM_CFLAGS} ${CFLAGS}" AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[ @@ -125,75 +133,166 @@ uint16_t x= htons(80); NO_STRICT_ALIASING="-fno-strict-aliasing -Wno-strict-aliasing" NO_SHADOW="-Wno-shadow" - m4_if(PW_LESS_WARNINGS,[no],[ - BASE_WARNINGS_FULL="-Wformat=2 ${W_CONVERSION} -Wstrict-aliasing" - CC_WARNINGS_FULL="-Wswitch-default -Wswitch-enum" - CXX_WARNINGS_FULL="-Weffc++ -Wold-style-cast" + AS_IF([test "$INTELCC" = "yes"],[ + m4_if(PW_LESS_WARNINGS,[no],[ + BASE_WARNINGS="-w1 -Werror -Wcheck -Wformat -Wp64 -Woverloaded-virtual -Wcast-qual" + ],[ + BASE_WARNINGS="-w1 -Wcheck -Wformat -Wp64 -Woverloaded-virtual -Wcast-qual -diag-disable 981" + ]) + CC_WARNINGS="${BASE_WARNINGS}" + CXX_WARNINGS="${BASE_WARNINGS}" ],[ - BASE_WARNINGS_FULL="-Wformat ${NO_STRICT_ALIASING}" - ]) + m4_if(PW_LESS_WARNINGS,[no],[ + BASE_WARNINGS_FULL="-Wformat=2 ${W_CONVERSION} -Wstrict-aliasing" + CC_WARNINGS_FULL="-Wswitch-default -Wswitch-enum -Wwrite-strings" + CXX_WARNINGS_FULL="-Weffc++ -Wold-style-cast" + ],[ + BASE_WARNINGS_FULL="-Wformat ${NO_STRICT_ALIASING}" + ]) - BASE_WARNINGS="${W_FAIL} -pedantic -Wall -Wextra -Wundef -Wshadow -Wstrict-aliasing ${F_DIAGNOSTICS_SHOW_OPTION} ${CFLAG_VISIBILITY} ${BASE_WARNINGS_FULL}" - CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}" - CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}" - - AC_CACHE_CHECK([whether it is safe to use -Wmissing-declarations from C++], - [ac_cv_safe_to_use_Wmissing_declarations_], - [AC_LANG_PUSH(C++) - save_CXXFLAGS="$CXXFLAGS" - CXXFLAGS="-Werror -pedantic -Wmissing-declarations ${AM_CXXFLAGS}" - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM( - [[ + AS_IF([test "${ac_cv_assert}" = "no"], + [NO_UNUSED="-Wno-unused-variable -Wno-unused-parameter"]) + + AC_CACHE_CHECK([whether it is safe to use -Wextra], + [ac_cv_safe_to_use_Wextra_], + [save_CFLAGS="$CFLAGS" + CFLAGS="${W_FAIL} -pedantic -Wextra ${AM_CFLAGS} ${CFLAGS}" + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[ #include - ]], [[]]) - ], - [ac_cv_safe_to_use_Wmissing_declarations_=yes], - [ac_cv_safe_to_use_Wmissing_declarations_=no]) - CXXFLAGS="$save_CXXFLAGS" - AC_LANG_POP() - ]) - AS_IF([test "$ac_cv_safe_to_use_Wmissing_declarations_" = "yes"], - [CXX_WARNINGS="${CXX_WARNINGS} -Wmissing-declarations"]) + ]], [[]]) + ], + [ac_cv_safe_to_use_Wextra_=yes], + [ac_cv_safe_to_use_Wextra_=no]) + CFLAGS="$save_CFLAGS"]) - AC_CACHE_CHECK([whether it is safe to use -Wlogical-op], - [ac_cv_safe_to_use_Wlogical_op_], - [save_CFLAGS="$CFLAGS" - CFLAGS="${W_FAIL} -pedantic -Wlogical-op ${AM_CFLAGS}" - AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM( - [[ + BASE_WARNINGS="${W_FAIL} -pedantic -Wall -Wundef -Wshadow ${NO_UNUSED} ${F_DIAGNOSTICS_SHOW_OPTION} ${CFLAG_VISIBILITY} ${BASE_WARNINGS_FULL}" + AS_IF([test "$ac_cv_safe_to_use_Wextra_" = "yes"], + [BASE_WARNINGS="${BASE_WARNINGS} -Wextra"], + [BASE_WARNINGS="${BASE_WARNINGS} -W"]) + + CC_WARNINGS="${BASE_WARNINGS} -Wstrict-prototypes -Wmissing-prototypes -Wredundant-decls -Wmissing-declarations -Wcast-align ${CC_WARNINGS_FULL}" + CXX_WARNINGS="${BASE_WARNINGS} -Woverloaded-virtual -Wnon-virtual-dtor -Wctor-dtor-privacy -Wno-long-long ${CXX_WARNINGS_FULL}" + + AC_CACHE_CHECK([whether it is safe to use -Wmissing-declarations from C++], + [ac_cv_safe_to_use_Wmissing_declarations_], + [AC_LANG_PUSH(C++) + save_CXXFLAGS="$CXXFLAGS" + CXXFLAGS="-Werror -pedantic -Wmissing-declarations ${AM_CXXFLAGS}" + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[ #include - ]], [[]]) - ], - [ac_cv_safe_to_use_Wlogical_op_=yes], - [ac_cv_safe_to_use_Wlogical_op_=no]) - CFLAGS="$save_CFLAGS"]) - AS_IF([test "$ac_cv_safe_to_use_Wlogical_op_" = "yes"], - [CC_WARNINGS="${CC_WARNINGS} -Wlogical-op"]) - - AC_CACHE_CHECK([whether it is safe to use -Wredundant-decls from C++], - [ac_cv_safe_to_use_Wredundant_decls_], - [AC_LANG_PUSH(C++) - save_CXXFLAGS="${CXXFLAGS}" - CXXFLAGS="${W_FAIL} -pedantic -Wredundant-decls ${AM_CXXFLAGS}" - AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([ + ]], [[]]) + ], + [ac_cv_safe_to_use_Wmissing_declarations_=yes], + [ac_cv_safe_to_use_Wmissing_declarations_=no]) + CXXFLAGS="$save_CXXFLAGS" + AC_LANG_POP() + ]) + AS_IF([test "$ac_cv_safe_to_use_Wmissing_declarations_" = "yes"], + [CXX_WARNINGS="${CXX_WARNINGS} -Wmissing-declarations"]) + + AC_CACHE_CHECK([whether it is safe to use -Wlogical-op], + [ac_cv_safe_to_use_Wlogical_op_], + [save_CFLAGS="$CFLAGS" + CFLAGS="${W_FAIL} -pedantic -Wlogical-op ${AM_CFLAGS} ${CFLAGS}" + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[ +#include + ]], [[]]) + ], + [ac_cv_safe_to_use_Wlogical_op_=yes], + [ac_cv_safe_to_use_Wlogical_op_=no]) + CFLAGS="$save_CFLAGS"]) + AS_IF([test "$ac_cv_safe_to_use_Wlogical_op_" = "yes"], + [CC_WARNINGS="${CC_WARNINGS} -Wlogical-op"]) + + AC_CACHE_CHECK([whether it is safe to use -Wredundant-decls from C++], + [ac_cv_safe_to_use_Wredundant_decls_], + [AC_LANG_PUSH(C++) + save_CXXFLAGS="${CXXFLAGS}" + CXXFLAGS="${W_FAIL} -pedantic -Wredundant-decls ${AM_CXXFLAGS}" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([ template struct C { void foo(); }; template void C::foo() { } template <> void C::foo(); - AC_INCLUDES_DEFAULT])], - [ac_cv_safe_to_use_Wredundant_decls_=yes], - [ac_cv_safe_to_use_Wredundant_decls_=no]) - CXXFLAGS="${save_CXXFLAGS}" - AC_LANG_POP()]) - AS_IF([test "$ac_cv_safe_to_use_Wredundant_decls_" = "yes"], - [CXX_WARNINGS="${CXX_WARNINGS} -Wredundant-decls"], - [CXX_WARNINGS="${CXX_WARNINGS} -Wno-redundant-decls"]) - - NO_REDUNDANT_DECLS="-Wno-redundant-decls" - PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow" - + AC_INCLUDES_DEFAULT])], + [ac_cv_safe_to_use_Wredundant_decls_=yes], + [ac_cv_safe_to_use_Wredundant_decls_=no]) + CXXFLAGS="${save_CXXFLAGS}" + AC_LANG_POP()]) + AS_IF([test "$ac_cv_safe_to_use_Wredundant_decls_" = "yes"], + [CXX_WARNINGS="${CXX_WARNINGS} -Wredundant-decls"], + [CXX_WARNINGS="${CXX_WARNINGS} -Wno-redundant-decls"]) + + AC_CACHE_CHECK([whether it is safe to use -Wattributes from C++], + [ac_cv_safe_to_use_Wattributes_], + [AC_LANG_PUSH(C++) + save_CXXFLAGS="${CXXFLAGS}" + CXXFLAGS="${W_FAIL} -pedantic -Wattributes -fvisibility=hidden ${AM_CXXFLAGS}" + AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([ +#include +#include + + +const ::google::protobuf::EnumDescriptor* Table_TableOptions_RowType_descriptor(); +enum Table_TableOptions_RowType { + Table_TableOptions_RowType_ROW_TYPE_DEFAULT = 0, + Table_TableOptions_RowType_ROW_TYPE_FIXED = 1, + Table_TableOptions_RowType_ROW_TYPE_DYNAMIC = 2, + Table_TableOptions_RowType_ROW_TYPE_COMPRESSED = 3, + Table_TableOptions_RowType_ROW_TYPE_REDUNDANT = 4, + Table_TableOptions_RowType_ROW_TYPE_COMPACT = 5, + Table_TableOptions_RowType_ROW_TYPE_PAGE = 6 +}; + +namespace google { +namespace protobuf { +template <> +inline const EnumDescriptor* GetEnumDescriptor() { + return Table_TableOptions_RowType_descriptor(); +} +} +} + ])], + [ac_cv_safe_to_use_Wattributes_=yes], + [ac_cv_safe_to_use_Wattributes_=no]) + CXXFLAGS="${save_CXXFLAGS}" + AC_LANG_POP()]) + AC_CACHE_CHECK([whether it is safe to use -Wno-attributes], + [ac_cv_safe_to_use_Wno_attributes_], + [save_CFLAGS="$CFLAGS" + CFLAGS="${W_FAIL} -pedantic -Wno_attributes_ ${AM_CFLAGS} ${CFLAGS}" + AC_COMPILE_IFELSE([ + AC_LANG_PROGRAM( + [[ +#include + ]], [[]]) + ], + [ac_cv_safe_to_use_Wno_attributes_=yes], + [ac_cv_safe_to_use_Wno_attributes_=no]) + CFLAGS="$save_CFLAGS"]) + + dnl GCC 3.4 doesn't have -Wno-attributes, so we can't turn them off + dnl by using that. + AS_IF([test "$ac_cv_safe_to_use_Wattributes_" != "yes"],[ + AS_IF([test "$ac_cv_safe_to_use_Wno_attributes_" = "yes"],[ + CC_WARNINGS="${CC_WARNINGS} -Wno-attributes" + NO_ATTRIBUTES="-Wno-attributes"])]) + + + NO_REDUNDANT_DECLS="-Wno-redundant-decls" + dnl TODO: Figure out a better way to deal with this: + PROTOSKIP_WARNINGS="-Wno-effc++ -Wno-shadow -Wno-missing-braces ${NO_ATTRIBUTES}" + NO_WERROR="-Wno-error" + INNOBASE_SKIP_WARNINGS="-Wno-shadow -Wno-cast-align" + + ]) ]) AS_IF([test "$SUNCC" = "yes"],[ @@ -224,15 +323,17 @@ template <> void C::foo(); m4_if(PW_LESS_WARNINGS, [no],[ CC_WARNINGS_FULL="-erroff=E_INTEGER_OVERFLOW_DETECTED${W_PASTE_RESULT}" + CXX_WARNINGS_FULL="-erroff=inllargeuse" ],[ CC_WARNINGS_FULL="-erroff=E_ATTRIBUTE_NOT_VAR" CXX_WARNINGS_FULL="-erroff=attrskipunsup,doubunder,reftotemp,inllargeuse,truncwarn1,signextwarn,inllargeint" ]) - CC_WARNINGS="-v -errtags=yes ${W_FAIL} ${CC_WARNINGS_FULL}" - CXX_WARNINGS="+w +w2 -xwe -xport64 -errtags=yes ${CXX_WARNINGS_FULL} ${W_FAIL}" - PROTOSKIP_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,wbadinitl,identexpected,inllargeuse,truncwarn1,signextwarn" + CC_WARNINGS="-v -errtags=yes ${W_FAIL} ${CC_WARNINGS_FULL} ${CFLAG_VISIBILITY}" + CXX_WARNINGS="+w +w2 -xwe -xport64 -errtags=yes ${CXX_WARNINGS_FULL} ${W_FAIL} ${CFLAG_VISIBILITY}" + PROTOSKIP_WARNINGS="-erroff=attrskipunsup,doubunder,reftotemp,wbadinitl,identexpected,inllargeuse,truncwarn1,signextwarn,partinit,notused,badargtype2w,wbadinit" NO_UNREACHED="-erroff=E_STATEMENT_NOT_REACHED" + NO_WERROR="-errwarn=%none" ]) @@ -242,5 +343,8 @@ template <> void C::foo(); AC_SUBST(NO_SHADOW) AC_SUBST(NO_STRICT_ALIASING) AC_SUBST(PROTOSKIP_WARNINGS) + AC_SUBST(INNOBASE_SKIP_WARNINGS) + AC_SUBST(NO_WERROR) + AC_SUBST([GCOV_LIBS]) ])