Update yatl.
[awesomized/libmemcached] / m4 / ax_harden_compiler_flags.m4
index 754955e0296f31f79439773c26b05d2629caddc5..66de89d358a7ae3939c5a795d7d4aaa7133d7dc3 100644 (file)
 
 #serial 7
 
+AC_DEFUN([_WARNINGS_AS_ERRORS],
+    [AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors],
+      [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[ac_cv_warnings_as_errors=yes],
+        [ac_cv_warnings_as_errors=no])
+      ])
+    ])
+
 AC_DEFUN([_APPEND_LINK_FLAGS_ERROR],
          [AC_REQUIRE([AX_APPEND_LINK_FLAGS])
          AX_APPEND_LINK_FLAGS([$1],[LIB],[-Werror])
@@ -64,21 +71,25 @@ AC_DEFUN([_APPEND_COMPILE_FLAGS_ERROR],
          AX_APPEND_COMPILE_FLAGS([$1],,[-Werror])
          ])
 
+# Everything above this does the heavy lifting, while what follows does the specifics.
+
 AC_DEFUN([_HARDEN_LINKER_FLAGS],
          [_APPEND_LINK_FLAGS_ERROR([-z relro -z now])
          _APPEND_LINK_FLAGS_ERROR([-pie])
          AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
-               [_APPEND_LINK_FLAGS_ERROR([-Werror])])
+               [AX_APPEND_LINK_FLAGS([-Werror])])
          ])
 
 AC_DEFUN([_HARDEN_CC_COMPILER_FLAGS],
          [AC_LANG_PUSH([C])dnl
 
-         _APPEND_COMPILE_FLAGS_ERROR([-g])
          AS_IF([test "x$ax_enable_debug" = xyes],
-               [_APPEND_COMPILE_FLAGS_ERROR([-ggdb])
-               _APPEND_COMPILE_FLAGS_ERROR([-O0])],
-               [_APPEND_COMPILE_FLAGS_ERROR([-O2])])
+           [CFLAGS=''
+           _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
+           _APPEND_COMPILE_FLAGS_ERROR([-g])
+           _APPEND_COMPILE_FLAGS_ERROR([-O0])],
+           [_APPEND_COMPILE_FLAGS_ERROR([-g])
+           _APPEND_COMPILE_FLAGS_ERROR([-O2])])
 
          _APPEND_COMPILE_FLAGS_ERROR([-Wno-pragmas])
          _APPEND_COMPILE_FLAGS_ERROR([-Wall])
@@ -133,21 +144,25 @@ AC_DEFUN([_HARDEN_CC_COMPILER_FLAGS],
           _APPEND_COMPILE_FLAGS_ERROR([-floop-parallelize-all])
           _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
           _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
+          _APPEND_COMPILE_FLAGS_ERROR([-pipe])
 
           AS_IF([test "x$ax_enable_debug" = xno],
             [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
                   [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
                   AS_IF([test "x$ac_c_gcc_recent" = xyes],
                         [_APPEND_COMPILE_FLAGS_ERROR([-D_FORTIFY_SOURCE=2])
-                        _APPEND_COMPILE_FLAGS_ERROR([-Wstack-protector])
+#                        _APPEND_COMPILE_FLAGS_ERROR([-Wstack-protector])
                         _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector])
-                        _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all])
+#                        _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all])
                         ])])])
 
          AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
                [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])],
                [_APPEND_COMPILE_FLAGS_ERROR([-Wno-pragmas])])
 
+         AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
+             [AX_APPEND_FLAG([-Werror])])
+
           AC_LANG_POP([C])
   ])
 
@@ -155,89 +170,85 @@ AC_DEFUN([_HARDEN_CXX_COMPILER_FLAGS],
          [AC_LANG_PUSH([C++])
          AC_REQUIRE([_APPEND_COMPILE_FLAGS_ERROR])
 
-            _APPEND_COMPILE_FLAGS_ERROR([-g])
-            AS_IF([test "x$ax_enable_debug" = xyes],
-                  [_APPEND_COMPILE_FLAGS_ERROR([-O0])
-                  _APPEND_COMPILE_FLAGS_ERROR([-ggdb])],
-                  [_APPEND_COMPILE_FLAGS_ERROR([-O2])])
+         AS_IF([test "x$ax_enable_debug" = xyes],
+           [CXXFLAGS=''
+           _APPEND_COMPILE_FLAGS_ERROR([-ggdb])
+           _APPEND_COMPILE_FLAGS_ERROR([-g])
+           _APPEND_COMPILE_FLAGS_ERROR([-O0])],
+           [_APPEND_COMPILE_FLAGS_ERROR([-g])
+           _APPEND_COMPILE_FLAGS_ERROR([-O2])])
 
-            AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
-                  [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])],
-                  [_APPEND_COMPILE_FLAGS_ERROR([-Wno-pragmas])])
+         AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
+           [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])],
+           [_APPEND_COMPILE_FLAGS_ERROR([-Wno-pragmas])])
 
-            _APPEND_COMPILE_FLAGS_ERROR([-Wall])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wextra])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wunknown-pragmas])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wthis-test-should-fail])
+         _APPEND_COMPILE_FLAGS_ERROR([-Wall])
+         _APPEND_COMPILE_FLAGS_ERROR([-Wextra])
+         _APPEND_COMPILE_FLAGS_ERROR([-Wunknown-pragmas])
+         _APPEND_COMPILE_FLAGS_ERROR([-Wthis-test-should-fail])
 # Anything below this comment please keep sorted.
-            _APPEND_COMPILE_FLAGS_ERROR([--param=ssp-buffer-size=1])
+         _APPEND_COMPILE_FLAGS_ERROR([--param=ssp-buffer-size=1])
 # _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-format-attribute])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wno-attributes])
-            _APPEND_COMPILE_FLAGS_ERROR([-Waddress])
-            _APPEND_COMPILE_FLAGS_ERROR([-Warray-bounds])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wchar-subscripts])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wcomment])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wctor-dtor-privacy])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wfloat-equal])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wformat=2])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wmaybe-uninitialized])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-field-initializers])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wlogical-op])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wnon-virtual-dtor])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wnormalized=id])
-            _APPEND_COMPILE_FLAGS_ERROR([-Woverloaded-virtual])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wpointer-arith])
-            AS_IF([test "x$MINGW" = xyes],
-                  [_APPEND_COMPILE_FLAGS_ERROR([-Wno-suggest-attribute=const])
-                  _APPEND_COMPILE_FLAGS_ERROR([-Wno-missing-noreturn])
-                  _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-noreturn])
-                  _APPEND_COMPILE_FLAGS_ERROR([-Wno-suggest-attribute=noreturn])
-                  _APPEND_COMPILE_FLAGS_ERROR([-Wno-error=suggest-attribute=noreturn])
-                  _APPEND_COMPILE_FLAGS_ERROR([-Wno-redundant-decls])],
-                  [_APPEND_COMPILE_FLAGS_ERROR([-Wredundant-decls])])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wshadow])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wshorten-64-to-32])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wsign-compare])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wstrict-overflow=1])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wswitch-enum])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wunused-variable])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wwrite-strings])
-            _APPEND_COMPILE_FLAGS_ERROR([-Wformat-security])
-            _APPEND_COMPILE_FLAGS_ERROR([-floop-parallelize-all])
-            _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
-            _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wno-attributes])
+          _APPEND_COMPILE_FLAGS_ERROR([-Waddress])
+          _APPEND_COMPILE_FLAGS_ERROR([-Warray-bounds])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wchar-subscripts])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wcomment])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wctor-dtor-privacy])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wfloat-equal])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wformat=2])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wmaybe-uninitialized])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-field-initializers])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wlogical-op])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wnon-virtual-dtor])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wnormalized=id])
+          _APPEND_COMPILE_FLAGS_ERROR([-Woverloaded-virtual])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wpointer-arith])
+          AS_IF([test "x$MINGW" = xyes],
+                [_APPEND_COMPILE_FLAGS_ERROR([-Wno-suggest-attribute=const])
+                _APPEND_COMPILE_FLAGS_ERROR([-Wno-missing-noreturn])
+                _APPEND_COMPILE_FLAGS_ERROR([-Wmissing-noreturn])
+                _APPEND_COMPILE_FLAGS_ERROR([-Wno-suggest-attribute=noreturn])
+                _APPEND_COMPILE_FLAGS_ERROR([-Wno-error=suggest-attribute=noreturn])
+                _APPEND_COMPILE_FLAGS_ERROR([-Wno-redundant-decls])],
+                [_APPEND_COMPILE_FLAGS_ERROR([-Wredundant-decls])])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wshadow])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wshorten-64-to-32])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wsign-compare])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wstrict-overflow=1])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wswitch-enum])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wundef])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wc++11-compat])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wunused])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wunused-result])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wunused-variable])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wwrite-strings])
+          _APPEND_COMPILE_FLAGS_ERROR([-Wformat-security])
+          _APPEND_COMPILE_FLAGS_ERROR([-floop-parallelize-all])
+          _APPEND_COMPILE_FLAGS_ERROR([-fwrapv])
+          _APPEND_COMPILE_FLAGS_ERROR([-fmudflapt])
+          _APPEND_COMPILE_FLAGS_ERROR([-pipe])
 
-            AS_IF([test "x$ax_enable_debug" = xno],
-            [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
-                  [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
-                  AS_IF([test "x$ac_c_gcc_recent" = xyes],
-                        [_APPEND_COMPILE_FLAGS_ERROR([-D_FORTIFY_SOURCE=2])
-                        _APPEND_COMPILE_FLAGS_ERROR([-Wstack-protector])
-                        _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector])
-                        _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all])
-                        ])])])
+          AS_IF([test "x$ax_enable_debug" = xno],
+          [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],
+                [_APPEND_COMPILE_FLAGS_ERROR([-fstack-check])
+                AS_IF([test "x$ac_c_gcc_recent" = xyes],
+                      [_APPEND_COMPILE_FLAGS_ERROR([-D_FORTIFY_SOURCE=2])
+#                      _APPEND_COMPILE_FLAGS_ERROR([-Wstack-protector])
+                      _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector])
+#                      _APPEND_COMPILE_FLAGS_ERROR([-fstack-protector-all])
+                      ])])])
 
-            AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
-                  [_APPEND_COMPILE_FLAGS_ERROR([-Werror])])
-            AC_LANG_POP([C++])
+          AS_IF([test "x$ac_cv_warnings_as_errors" = xyes],
+                [AX_APPEND_FLAG([-Werror])])
+          AC_LANG_POP([C++])
   ])
 
-  AC_DEFUN([_CC_OTHER_FLAGS],
-            [AC_REQUIRE([_APPEND_COMPILE_FLAGS_ERROR])
-
-            AC_LANG_PUSH([C])
-            _APPEND_COMPILE_FLAGS_ERROR([-pipe])
-            AC_LANG_POP([C])
-            ])
-
 # All of the heavy lifting happens in _HARDEN_LINKER_FLAGS,
-# _HARDEN_CC_COMPILER_FLAGS, _HARDEN_CXX_COMPILER_FLAGS, _CC_OTHER_FLAGS
+# _HARDEN_CC_COMPILER_FLAGS, _HARDEN_CXX_COMPILER_FLAGS
   AC_DEFUN([AX_HARDEN_COMPILER_FLAGS],
            [AC_PREREQ([2.63])dnl
+           AC_REQUIRE([_WARNINGS_AS_ERRORS])
            AC_REQUIRE([AX_APPEND_LINK_FLAGS])
            AC_REQUIRE([AX_COMPILER_VERSION])
            AC_REQUIRE([AX_DEBUG])
@@ -246,13 +257,7 @@ AC_DEFUN([_HARDEN_CXX_COMPILER_FLAGS],
            AC_REQUIRE([gl_VISIBILITY])
            AS_IF([test -n "$CFLAG_VISIBILITY"],[CPPFLAGS="$CPPFLAGS $CFLAG_VISIBILITY"])
 
-           AC_CACHE_CHECK([if all warnings into errors],[ac_cv_warnings_as_errors],
-                          [AS_IF([test "x$ac_cv_vcs_checkout" = xyes],[ac_cv_warnings_as_errors=yes],
-                                 [ac_cv_warnings_as_errors=no])
-                          ])
-
            AC_REQUIRE([_HARDEN_LINKER_FLAGS])
            AC_REQUIRE([_HARDEN_CC_COMPILER_FLAGS])
            AC_REQUIRE([_HARDEN_CXX_COMPILER_FLAGS])
-           AC_REQUIRE([_CC_OTHER_FLAGS])
            ])