X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=m4%2Fax_harden_compiler_flags.m4;h=7eecc0a192a7268c079f89527192cc1d2f13c374;hb=c625134668213eff97a837da54daec4425710d67;hp=d8b997f7b64d9d6e66c9afb3439b6a74850b68be;hpb=7ab3500b376928c4a621cfa29289aa1eaeecd60d;p=awesomized%2Flibmemcached

diff --git a/m4/ax_harden_compiler_flags.m4 b/m4/ax_harden_compiler_flags.m4
index d8b997f7..7eecc0a1 100644
--- a/m4/ax_harden_compiler_flags.m4
+++ b/m4/ax_harden_compiler_flags.m4
@@ -54,42 +54,96 @@
 # AX_APPEND_COMPILE_FLAGS([-Wlong-long]) -- Don't turn on for compatibility issues memcached_stat_st
 
 #serial 2
+  AC_DEFUN([AX_HARDEN_LINKER_FLAGS], [
+      AC_REQUIRE([AX_CHECK_LINK_FLAG])
+      AC_REQUIRE([AX_VCS_CHECKOUT])
+      AC_REQUIRE([AX_DEBUG])
+
+      AS_IF([test "$ac_cv_vcs_checkout" = yes], [
+          AX_CHECK_LINK_FLAG([-Werror])
+          ])
+      AX_CHECK_LINK_FLAG([-z relro -z now])
+      AX_CHECK_LINK_FLAG([-pie])
+      ])
 
   AC_DEFUN([AX_HARDEN_C_COMPILER_FLAGS], [
       AC_REQUIRE([AX_APPEND_COMPILE_FLAGS])
-      AC_REQUIRE([AX_CHECK_LINK_FLAG])
-      AC_REQUIRE([AX_VCS_CHECKOUT])
+      AC_REQUIRE([AX_HARDEN_LINKER_FLAGS])
 
       AC_LANG_PUSH([C])
-      AX_APPEND_COMPILE_FLAGS([-O2])
+      AS_IF([test "$ax_with_debug" = yes], [
+        AX_APPEND_COMPILE_FLAGS([-O0])],[
+        AX_APPEND_COMPILE_FLAGS([-O2])
+        ])
+
+      ac_cv_warnings_as_errors=no
       AS_IF([test "$ac_cv_vcs_checkout" = yes], [
         AX_APPEND_COMPILE_FLAGS([-Werror])
+        ac_cv_warnings_as_errors=yes
         ])
+
       AX_APPEND_COMPILE_FLAGS([-Wall])
       AX_APPEND_COMPILE_FLAGS([-Wextra])
-      AX_APPEND_COMPILE_FLAGS([-std=c99])
+      AX_APPEND_COMPILE_FLAGS([-Wpragmas])
+      AX_APPEND_COMPILE_FLAGS([--paramssp-buffer-size=1])
+      AX_APPEND_COMPILE_FLAGS([-Waddress])
+      AX_APPEND_COMPILE_FLAGS([-Warray-bounds])
       AX_APPEND_COMPILE_FLAGS([-Wbad-function-cast])
+      AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts])
+      AX_APPEND_COMPILE_FLAGS([-Wcomment])
+      AX_APPEND_COMPILE_FLAGS([-Wctor-dtor-privacy])
+      AX_APPEND_COMPILE_FLAGS([-Wfloat-equal])
+      AX_APPEND_COMPILE_FLAGS([-Wformat=2])
+      AX_APPEND_COMPILE_FLAGS([-Wlogical-op])
+      AX_APPEND_COMPILE_FLAGS([-Wmaybe-uninitialized])
+      AX_APPEND_COMPILE_FLAGS([-Wmissing-field-initializers])
+      AX_APPEND_COMPILE_FLAGS([-Wmissing-noreturn])
       AX_APPEND_COMPILE_FLAGS([-Wmissing-prototypes])
       AX_APPEND_COMPILE_FLAGS([-Wnested-externs])
+      AX_APPEND_COMPILE_FLAGS([-Wnon-virtual-dtor])
+      AX_APPEND_COMPILE_FLAGS([-Wnormalized=id])
       AX_APPEND_COMPILE_FLAGS([-Wold-style-definition])
+      AX_APPEND_COMPILE_FLAGS([-Woverloaded-virtual])
       AX_APPEND_COMPILE_FLAGS([-Woverride-init])
+      AX_APPEND_COMPILE_FLAGS([-Wpointer-arith])
+      AX_APPEND_COMPILE_FLAGS([-Wredundant-decls])
+      AX_APPEND_COMPILE_FLAGS([-Wshadow])
+      AX_APPEND_COMPILE_FLAGS([-Wshorten-64-to-32])
+      AX_APPEND_COMPILE_FLAGS([-Wsign-compare])
+      AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow=1])
       AX_APPEND_COMPILE_FLAGS([-Wstrict-prototypes])
-      AX_APPEND_COMPILE_FLAGS([-Wlogical-op])
+      AX_APPEND_COMPILE_FLAGS([-Wswitch-enum])
+      AX_APPEND_COMPILE_FLAGS([-Wundef])
+      AX_APPEND_COMPILE_FLAGS([-Wunused-result])
+      AX_APPEND_COMPILE_FLAGS([-Wunused-variable])
+      AX_APPEND_COMPILE_FLAGS([-Wwrite-strings])
+      AX_APPEND_COMPILE_FLAGS([-fPIE])
+      AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all])
+      AX_APPEND_COMPILE_FLAGS([-fwrapv])
+      AX_APPEND_COMPILE_FLAGS([-ggdb])
+      AX_APPEND_COMPILE_FLAGS([-std=c99])
       AC_LANG_POP
+
       ])
 
   AC_DEFUN([AX_HARDEN_CC_COMPILER_FLAGS], [
       AC_REQUIRE([AX_HARDEN_C_COMPILER_FLAGS])
       AC_LANG_PUSH([C++])
-      AX_APPEND_COMPILE_FLAGS([-O2])
+
+      AS_IF([test "$ax_with_debug" = yes], [
+        AX_APPEND_COMPILE_FLAGS([-O0])],[
+        AX_APPEND_COMPILE_FLAGS([-O2])
+        AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
+        ])
+
       AS_IF([test "$ac_cv_vcs_checkout" = yes], [
         AX_APPEND_COMPILE_FLAGS([-Werror])
         ])
+
       AX_APPEND_COMPILE_FLAGS([-Wall])
       AX_APPEND_COMPILE_FLAGS([-Wextra])
       AX_APPEND_COMPILE_FLAGS([-Wpragmas])
       AX_APPEND_COMPILE_FLAGS([--paramssp-buffer-size=1])
-      AX_APPEND_COMPILE_FLAGS([-D_FORTIFY_SOURCE=2])
       AX_APPEND_COMPILE_FLAGS([-Waddress])
       AX_APPEND_COMPILE_FLAGS([-Warray-bounds])
       AX_APPEND_COMPILE_FLAGS([-Wchar-subscripts])
@@ -117,10 +171,7 @@
       AX_APPEND_COMPILE_FLAGS([-Wwrite-strings])
       AX_APPEND_COMPILE_FLAGS([-floop-parallelize-all])
       AX_APPEND_COMPILE_FLAGS([-fwrapv])
+      AX_APPEND_COMPILE_FLAGS([-fPIE])
       AX_APPEND_COMPILE_FLAGS([-ggdb])
-      AS_IF([test "$ac_cv_vcs_checkout" = yes], [
-          AX_CHECK_LINK_FLAG([-Werror])
-          ])
-      AX_CHECK_LINK_FLAG([-z relro -z now])
       AC_LANG_POP
   ])