Split out -Wframe-larger-than warning from WARN_CLFAGS

Introduce STRICT_FRAME_LIMIT_CFLAGS that will be used for
production code and RELAXED_FRAME_LIMIT_CFLAGS for tests.

Raising the limit for tests allows building them with clang
with optimizations disabled.

diff --git a/daemon/Makefile.am b/daemon/Makefile.am
index 60c73686ff62d97280c1dbade2a18c56ef97fe22..d02ab33bd18c5a0b1cc2bea1d365b007fe1824e7 100644 (file)
--- a/daemon/Makefile.am
+++ b/daemon/Makefile.am
@@ -31,6 +31,8 @@ INCLUDES = \
 
 CLEANFILES =
 
+WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
+
 DAEMON_GENERATED =                     \
                remote_dispatch.h       \
                lxc_dispatch.h          \

diff --git a/m4/virt-compile-warnings.m4 b/m4/virt-compile-warnings.m4
index 17fdf9d14b94c0ecf91c70694a34e62dcd6d9cd9..768a5c88962c124271ef29c3bab1b612dba4d7cc 100644 (file)
--- a/m4/virt-compile-warnings.m4
+++ b/m4/virt-compile-warnings.m4
@@ -169,8 +169,8 @@ AC_DEFUN([LIBVIRT_COMPILE_WARNINGS],[
     # This should be < 256 really. Currently we're down to 4096,
     # but using 1024 bytes sized buffers (mostly for virStrerror)
     # stops us from going down further
-    wantwarn="$wantwarn -Wframe-larger-than=4096"
-    dnl wantwarn="$wantwarn -Wframe-larger-than=256"
+    gl_WARN_ADD(["-Wframe-larger-than=4096"], [STRICT_FRAME_LIMIT_CFLAGS])
+    gl_WARN_ADD(["-Wframe-larger-than=25600"], [RELAXED_FRAME_LIMIT_CFLAGS])
 
     # Extra special flags
     dnl -fstack-protector stuff passes gl_WARN_ADD with gcc

diff --git a/src/Makefile.am b/src/Makefile.am
index 75e4344198c52917f481e86e58ce0aeb8f70fff7..3c7adae492bf6205bbe64e44ebc2033887305bbe 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -37,6 +37,8 @@ INCLUDES =    -I../gnulib/lib                                 \
                -Dabs_topsrcdir="\"$(abs_topsrcdir)\""          \
                $(GETTEXT_CPPFLAGS)
 
+WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
+
 AM_CFLAGS =    $(LIBXML_CFLAGS)                                \
                $(WARN_CFLAGS)                                  \
                $(LOCK_CHECKING_CFLAGS)                         \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index aa9d2eb3a34337540bdad248279ef1ef8239a74c..279e9b7da866a4f9f0fd08ca5c1cdc0066c7ae75 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -33,6 +33,8 @@ INCLUDES = \
        -I$(top_srcdir)/src/conf \
        $(GETTEXT_CPPFLAGS)
 
+WARN_CFLAGS += $(RELAXED_FRAME_LIMIT_CFLAGS)
+
 AM_CFLAGS = \
        -Dabs_builddir="\"$(abs_builddir)\"" \
        -Dabs_topbuilddir="\"$(abs_topbuilddir)\"" \

diff --git a/tools/Makefile.am b/tools/Makefile.am
index 162d8e565c1f50a867397b573798b7d848e54617..bfacaf214b133e58bb52852eb62ecc06ddfe4a17 100644 (file)
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -23,6 +23,8 @@ INCLUDES = \
        -I$(top_srcdir)                                         \
        $(GETTEXT_CPPFLAGS)
 
+WARN_CFLAGS += $(STRICT_FRAME_LIMIT_CFLAGS)
+
 AM_LDFLAGS = \
        $(RELRO_LDFLAGS)                                        \
        $(NO_INDIRECT_LDFLAGS)                                  \