From cf7d36455fc43e88697f4fb8fd865f3259ba0d1a Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 29 Jul 2013 23:49:08 +0100
Subject: [PATCH] intel: Suppress some extremely noisy warnings

Warning about redundant declarations within the xorg headers hides
genuine warnings in our own code - disable them until the headers are
cleaned up.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 configure.ac            | 5 +++++
 src/Makefile.am         | 8 +++++++-
 src/sna/Makefile.am     | 1 +
 src/sna/brw/Makefile.am | 1 +
 src/sna/fb/Makefile.am  | 2 +-
 5 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index a004ef33..6b2c161f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,6 +43,11 @@ m4_ifndef([XORG_MACROS_VERSION],
 XORG_MACROS_VERSION(1.8)
 XORG_DEFAULT_OPTIONS
 
+# And disable a few very noisy warnings
+XORG_TESTSET_CFLAG([NOWARNFLAGS], [-Wno-cast-qual])
+XORG_TESTSET_CFLAG([NOWARNFLAGS], [-Wno-redundant-decls])
+AC_SUBST(NOWARNFLAGS)
+
 # Require X.Org server macros (i.e. XORG_DRIVER_CHECK_EXT) to check for required modules 
 m4_ifndef([XORG_DRIVER_CHECK_EXT],
           [m4_fatal([must install xorg-server macros before running autoconf/autogen.
diff --git a/src/Makefile.am b/src/Makefile.am
index 9df09159..16b69676 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -26,7 +26,13 @@ SUBDIRS = render_program legacy
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
 
-AM_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @DRM_CFLAGS@ @PCIACCESS_CFLAGS@
+AM_CFLAGS = \
+	@CWARNFLAGS@ \
+	@XORG_CFLAGS@ \
+	@DRM_CFLAGS@ \
+	@PCIACCESS_CFLAGS@ \
+	@NOWARNFLAGS@ \
+	$(NULL)
 
 intel_drv_la_LTLIBRARIES = intel_drv.la
 intel_drv_la_LDFLAGS = -module -avoid-version
diff --git a/src/sna/Makefile.am b/src/sna/Makefile.am
index 1551d31d..5d5417ec 100644
--- a/src/sna/Makefile.am
+++ b/src/sna/Makefile.am
@@ -27,6 +27,7 @@ AM_CFLAGS = \
 	@XORG_CFLAGS@ \
 	@UDEV_CFLAGS@ \
 	@DRM_CFLAGS@ \
+	@NOWARNFLAGS@
 	$(NULL)
 
 if VALGRIND
diff --git a/src/sna/brw/Makefile.am b/src/sna/brw/Makefile.am
index b3513cf9..61deb715 100644
--- a/src/sna/brw/Makefile.am
+++ b/src/sna/brw/Makefile.am
@@ -29,6 +29,7 @@ AM_CFLAGS = \
 	@XORG_CFLAGS@ \
 	@UDEV_CFLAGS@ \
 	@DRM_CFLAGS@ \
+	@NOWARNFLAGS@ \
 	$(NULL)
 
 if DEBUG
diff --git a/src/sna/fb/Makefile.am b/src/sna/fb/Makefile.am
index 72d9bbf5..b676812d 100644
--- a/src/sna/fb/Makefile.am
+++ b/src/sna/fb/Makefile.am
@@ -1,6 +1,6 @@
 noinst_LTLIBRARIES = libfb.la
 
-libfb_la_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@
+libfb_la_CFLAGS = @CWARNFLAGS@ @XORG_CFLAGS@ @NOWARNFLAGS@
 libfb_la_LIBADD = $(PIXMAN_LIBS)
 
 libfb_la_SOURCES = 	\