From c66ce72c2e69db81fb7569cca691deb534e21bc3 Mon Sep 17 00:00:00 2001
From: Danny Robson <danny@nerdcruft.net>
Date: Tue, 30 Jun 2015 22:01:32 +1000
Subject: [PATCH] m4: bump autocruft

---
 m4/nc_optimisation.m4 | 12 ++++++++++++
 m4/nc_warnings.m4     | 21 +++++++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/m4/nc_optimisation.m4 b/m4/nc_optimisation.m4
index f7460545..10c8bc95 100644
--- a/m4/nc_optimisation.m4
+++ b/m4/nc_optimisation.m4
@@ -28,6 +28,8 @@ AC_DEFUN([NC_OPTIMISATION],[
         AX_APPEND_COMPILE_FLAGS([-fno-fat-lto-objects], [], [-Werror])
         AX_APPEND_COMPILE_FLAGS([-flto-odr-type-merging], [], [-Werror])
         AX_APPEND_LINK_FLAGS([-fuse-linker-plugin], [], [-Werror])
+
+        AX_APPEND_COMPILE_FLAGS([-fdevirtualize-at-ltrans], [], [-Werror])
     ])
 
     ##-------------------------------------------------------------------------
@@ -67,6 +69,16 @@ AC_DEFUN([NC_OPTIMISATION],[
         # gcc >= 4.8 defaults to enabling stack-protector, we care more about
         # performance than security.
         AX_APPEND_COMPILE_FLAGS([-fno-stack-protector], [], [-Werror])
+
+        AX_APPEND_COMPILE_FLAGS([-ftree-loop-linear], [], [-Werror])
+        AX_APPEND_COMPILE_FLAGS([-floop-interchange], [], [-Werror])
+
+        AX_APPEND_COMPILE_FLAGS([-ftree-loop-distribution], [], [-Werror])
+        AX_APPEND_COMPILE_FLAGS([-ftree-loop-distribute-patterns], [], [-Werror])
+        AX_APPEND_COMPILE_FLAGS([-ftree-vectorize], [], [-Werror])
+        AX_APPEND_COMPILE_FLAGS([-floop-interchange], [], [-Werror])
+
+
     ])
 
     ##-------------------------------------------------------------------------
diff --git a/m4/nc_warnings.m4 b/m4/nc_warnings.m4
index 57bd125b..9f16183d 100644
--- a/m4/nc_warnings.m4
+++ b/m4/nc_warnings.m4
@@ -4,13 +4,17 @@ AC_DEFUN([NC_WARNINGS],[
 
     AX_COMPILER_VENDOR
 
+    # -------------------------------------------------------------------------
     # Compound warnings
     AX_APPEND_COMPILE_FLAGS([-Wall], [], [-Werror])
     AX_APPEND_COMPILE_FLAGS([-Wextra], [], [-Werror])
 
+    # -------------------------------------------------------------------------
     # General warnings
+    AX_APPEND_COMPILE_FLAGS([-Wbool-compare], [], [-Werror])
     AX_APPEND_COMPILE_FLAGS([-Wcast-align], [], [-Werror])
     AX_APPEND_COMPILE_FLAGS([-Wcast-qual], [], [-Werror])
+    AX_APPEND_COMPILE_FLAGS([-Wdisabled-optimization], [], [-Werror])
     AX_APPEND_COMPILE_FLAGS([-Wfloat-conversion], [], [-Werror])
     AX_APPEND_COMPILE_FLAGS([-Wfloat-equal], [], [-Werror])
     AX_APPEND_COMPILE_FLAGS([-Wno-aggressive-loop-optimizations], [], [-Werror])
@@ -25,10 +29,12 @@ AC_DEFUN([NC_WARNINGS],[
     AX_APPEND_COMPILE_FLAGS([-Wstrict-aliasing], [], [-Werror])
     AX_APPEND_COMPILE_FLAGS([-Wstrict-overflow], [], [-Werror])
     AX_APPEND_COMPILE_FLAGS([-Wtype-limits], [], [-Werror])
+    AX_APPEND_COMPILE_FLAGS([-Wunsafe-loop-optimizations], [], [-Werror])
     AX_APPEND_COMPILE_FLAGS([-Wunused-but-set-variable], [], [-Werror])
     AX_APPEND_COMPILE_FLAGS([-Wunused-parameter], [], [-Werror])
     AX_APPEND_COMPILE_FLAGS([-Wuseless-cast], [], [-Werror])
 
+    # -------------------------------------------------------------------------
     # Required extensions
     #AX_APPEND_COMPILE_FLAGS([-Wgnu-flexible-array-union-member], [], [-Werror])
     #AX_APPEND_COMPILE_FLAGS([-Wno-c99-extensions], [], [-Werror])
@@ -46,6 +52,7 @@ AC_DEFUN([NC_WARNINGS],[
         AX_APPEND_COMPILE_FLAGS([-Wno-zero-length-array], [], [-Werror])
     ])
 
+    # -------------------------------------------------------------------------
     # Excessive warnings
     AX_APPEND_COMPILE_FLAGS([-Wno-missing-braces], [], [-Werror])
 
@@ -54,6 +61,20 @@ AC_DEFUN([NC_WARNINGS],[
         AX_APPEND_COMPILE_FLAGS([-Wno-unused-const-variable], [], [-Werror])
     ])
 
+    # -------------------------------------------------------------------------
     # Strict warnings
     AX_APPEND_COMPILE_FLAGS([-pedantic], [], [-Werror])
+
+    # -------------------------------------------------------------------------
+    # Advisory warnings
+    AC_ARG_ENABLE([advisory], [
+        AS_HELP_STRING([--enable-advisory], [enable advisory warnings])
+    ])
+
+    AS_IF([test "x$enable_advisory" = "xyes"], [
+        AX_APPEND_COMPILE_FLAGS([-Winline], [], [-Werror])
+        AX_APPEND_COMPILE_FLAGS([-Wsuggest-final-types], [], [-Werror])
+        AX_APPEND_COMPILE_FLAGS([-Wsuggest-final-methods], [], [-Werror])
+        AX_APPEND_COMPILE_FLAGS([-Wsuggest-override], [], [-Werror])
+    ], [])
 ])