Set -Wno-unused-but-set-variable globally

As of gcc-4.6 the option -Wunused-but-set-variable is enabled by
default.  While this is a useful warning there are numerous places
in the ZFS code when a variable is set and then only checked in an
ASSERT().  To avoid having to update every instance of this in the
code we now set -Wno-unused-but-set-variable to suppress the warning.

Additionally, when building with --enable-debug and -Werror set these
warning also become fatal.  We can reevaluate the suppression of these
error at a later time if it becomes an issue.  For now we are basically
just reverting to the previous gcc behavior.

diff --git a/cmd/mount_zfs/Makefile.in b/cmd/mount_zfs/Makefile.in
index eb30f84aae62239e20f6510d8a1dcc17649ca94d..27afbebdd83c243f3066a792424c59e6a2bff649 100644 (file)
--- a/cmd/mount_zfs/Makefile.in
+++ b/cmd/mount_zfs/Makefile.in
@@ -304,9 +304,10 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\"
 mount_zfs_SOURCES = \
        $(top_srcdir)/cmd/mount_zfs/mount_zfs.c
 

diff --git a/cmd/zdb/Makefile.in b/cmd/zdb/Makefile.in
index 092b6b08f468334a810831796678578799724f24..bce8a786e8e9496d161194c2fd3d5d70e7dd5860 100644 (file)
--- a/cmd/zdb/Makefile.in
+++ b/cmd/zdb/Makefile.in
@@ -300,9 +300,10 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\"
 zdb_SOURCES = \
        $(top_srcdir)/cmd/zdb/zdb.c \
        $(top_srcdir)/cmd/zdb/zdb_il.c

diff --git a/cmd/zfs/Makefile.in b/cmd/zfs/Makefile.in
index f9e3c84b6fe2f13f41b562df49426fc20e03de34..8df35a2c98c55cf4073230517930db26260c895f 100644 (file)
--- a/cmd/zfs/Makefile.in
+++ b/cmd/zfs/Makefile.in
@@ -300,9 +300,10 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\"
 zfs_SOURCES = \
        $(top_srcdir)/cmd/zfs/zfs_iter.c \
        $(top_srcdir)/cmd/zfs/zfs_iter.h \

diff --git a/cmd/zinject/Makefile.in b/cmd/zinject/Makefile.in
index 7f3c041dae620ba1b2fa96090d7dc62dce8b2ef9..47ee6d74af29b05775dd11ce29287cc40ac7753f 100644 (file)
--- a/cmd/zinject/Makefile.in
+++ b/cmd/zinject/Makefile.in
@@ -300,9 +300,10 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\"
 zinject_SOURCES = \
        $(top_srcdir)/cmd/zinject/translate.c \
        $(top_srcdir)/cmd/zinject/zinject.c \

diff --git a/cmd/zpios/Makefile.in b/cmd/zpios/Makefile.in
index 70b84e2382c33b1cb3ebbc630ffd4c0d4533e752..9f42e2d6febad9416a7595fa4f5fc88ae04b67d3 100644 (file)
--- a/cmd/zpios/Makefile.in
+++ b/cmd/zpios/Makefile.in
@@ -290,9 +290,10 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\"
 zpios_SOURCES = \
        $(top_srcdir)/cmd/zpios/zpios_main.c \
        $(top_srcdir)/cmd/zpios/zpios_util.c \

diff --git a/cmd/zpool/Makefile.in b/cmd/zpool/Makefile.in
index 39b1d3bb4e4829e7bec0d15abaf1aadc65cef8f5..f3e4bc73ee6c2123dbffad7c7ef786622668140c 100644 (file)
--- a/cmd/zpool/Makefile.in
+++ b/cmd/zpool/Makefile.in
@@ -301,9 +301,10 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\"
 zpool_SOURCES = \
        $(top_srcdir)/cmd/zpool/zpool_iter.c \
        $(top_srcdir)/cmd/zpool/zpool_main.c \

diff --git a/cmd/ztest/Makefile.in b/cmd/ztest/Makefile.in
index c929bf0cc346c1c5309e0eecf8ee838b95e51bcc..65e36a0c9230951f08dba6594e5e527edfae2f89 100644 (file)
--- a/cmd/ztest/Makefile.in
+++ b/cmd/ztest/Makefile.in
@@ -300,10 +300,11 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" \
-       $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \
+       $(FRAME_LARGER_THAN)
 ztest_SOURCES = \
        $(top_srcdir)/cmd/ztest/ztest.c
 

diff --git a/cmd/zvol_id/Makefile.in b/cmd/zvol_id/Makefile.in
index 7698158b048a32feb4fb41e2d5b7d2c779885175..3e8a34be06cea77d942abc5710f8abd9c3c97119 100644 (file)
--- a/cmd/zvol_id/Makefile.in
+++ b/cmd/zvol_id/Makefile.in
@@ -290,9 +290,10 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\"
 zvol_id_SOURCES = \
        $(top_srcdir)/cmd/zvol_id/zvol_id_main.c
 

diff --git a/config/Rules.am b/config/Rules.am
index 19ee4a32cf0f5ad901b97200842cc0e6c6adf400..2abafcd4ddb8d64c175a347a6376f143a33684d4 100644 (file)
--- a/config/Rules.am
+++ b/config/Rules.am
@@ -1,7 +1,8 @@
 DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h
 
 AM_LIBTOOLFLAGS = --silent
-AM_CFLAGS  = -Wall -Wstrict-prototypes -fno-strict-aliasing ${DEBUG_CFLAGS}
+AM_CFLAGS  = -Wall -Wstrict-prototypes
+AM_CFLAGS += -fno-strict-aliasing -Wno-unused-but-set-variable ${DEBUG_CFLAGS}
 AM_CFLAGS += -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT
 AM_CFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64
 AM_CFLAGS += -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"

diff --git a/config/kernel.m4 b/config/kernel.m4
index 510f6dbc7f1dc4de763f552a2a0161917acce726..f31d93c9716861e2eb58084b6139df5afd9235a2 100644 (file)
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -44,6 +44,7 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
 
        dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other
        dnl # compiler options are added by the kernel build system.
+       KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-unused-but-set-variable"
        KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
        KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
 

diff --git a/configure b/configure
index feffaae4873d2d2164f1f34b8b90fbb850ab682f..30f3b325c8c6bc44910d256debf3472ff59ff9c8 100755 (executable)
--- a/configure
+++ b/configure
@@ -14364,7 +14364,8 @@ _ACEOF
 
 
 
-                       KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
+                       KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-unused-but-set-variable"
+       KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
        KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
 
 
@@ -18409,7 +18410,8 @@ _ACEOF
 
 
 
-                       KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
+                       KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-unused-but-set-variable"
+       KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
        KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
 
 

diff --git a/lib/libavl/Makefile.in b/lib/libavl/Makefile.in
index 29441be7e8c8fc1fb1ba3f3a163c87c8e2711de2..863d72e305a0a5965e4a4e16621f09a312424672 100644 (file)
--- a/lib/libavl/Makefile.in
+++ b/lib/libavl/Makefile.in
@@ -310,10 +310,11 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" \
-       $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \
+       $(FRAME_LARGER_THAN)
 lib_LTLIBRARIES = libavl.la
 libavl_la_SOURCES = \
        $(top_srcdir)/module/avl/avl.c

diff --git a/lib/libefi/Makefile.in b/lib/libefi/Makefile.in
index 9f918294cb6f08538c9537efeb4c745bd2d1ea00..77f99b6b58ab4d3c3e8a20c78f2954e1d0c8b690 100644 (file)
--- a/lib/libefi/Makefile.in
+++ b/lib/libefi/Makefile.in
@@ -310,10 +310,11 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" \
-       $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \
+       $(FRAME_LARGER_THAN)
 lib_LTLIBRARIES = libefi.la
 libefi_la_SOURCES = \
        $(top_srcdir)/lib/libefi/rdwr_efi.c

diff --git a/lib/libnvpair/Makefile.in b/lib/libnvpair/Makefile.in
index 0848c9427b094741a562a664cbe53ac5f014f566..31a6ccba7349b116a9d7363d2a36ec38aef0a9a5 100644 (file)
--- a/lib/libnvpair/Makefile.in
+++ b/lib/libnvpair/Makefile.in
@@ -311,10 +311,11 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" \
-       $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \
+       $(FRAME_LARGER_THAN)
 lib_LTLIBRARIES = libnvpair.la
 libnvpair_la_SOURCES = \
        $(top_srcdir)/lib/libnvpair/libnvpair.c \

diff --git a/lib/libspl/Makefile.in b/lib/libspl/Makefile.in
index 7e1bc6d5a5bfa7ecd62224fe97d959a02cc3fbc9..e9f98817aa522b0d1ac58d01eb3b24a27020a0f4 100644 (file)
--- a/lib/libspl/Makefile.in
+++ b/lib/libspl/Makefile.in
@@ -361,10 +361,11 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" \
-       $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \
+       $(FRAME_LARGER_THAN)
 SUBDIRS = include $(TARGET_ASM_DIR)
 DIST_SUBDIRS = include asm-generic asm-i386 asm-x86_64
 AM_CCASFLAGS = \

diff --git a/lib/libspl/asm-generic/Makefile.in b/lib/libspl/asm-generic/Makefile.in
index b49f38c4febad1808b020a8424bc0f9edeb23cac..22f975042f26939fb9ee94f2223a2826ef455325 100644 (file)
--- a/lib/libspl/asm-generic/Makefile.in
+++ b/lib/libspl/asm-generic/Makefile.in
@@ -259,9 +259,10 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\"
 atomic_SOURCE = atomic.c
 atomic_ASM = atomic.S
 COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \

diff --git a/lib/libunicode/Makefile.in b/lib/libunicode/Makefile.in
index 617f308175da03dc00115fcc021b06b2920e3a6c..6098ce9599df53a56d9a12d5a3b362eb4f80c1e2 100644 (file)
--- a/lib/libunicode/Makefile.in
+++ b/lib/libunicode/Makefile.in
@@ -310,10 +310,11 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" \
-       $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \
+       $(FRAME_LARGER_THAN)
 lib_LTLIBRARIES = libunicode.la
 libunicode_la_SOURCES = \
        $(top_srcdir)/module/unicode/u8_textprep.c \

diff --git a/lib/libuutil/Makefile.in b/lib/libuutil/Makefile.in
index 168724d803c44169f6192588798114da1cdc886a..c200819460c54e680bb69846b0bdf855e8cc60c2 100644 (file)
--- a/lib/libuutil/Makefile.in
+++ b/lib/libuutil/Makefile.in
@@ -312,10 +312,11 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" \
-       $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \
+       $(FRAME_LARGER_THAN)
 lib_LTLIBRARIES = libuutil.la
 libuutil_la_LIBADD = $(top_builddir)/lib/libavl/libavl.la
 libuutil_la_SOURCES = \

diff --git a/lib/libzfs/Makefile.in b/lib/libzfs/Makefile.in
index 2880412abb0a29d8fbd72795367c677dc7eea018..bcd310151d3b117e10142b7113502e7985ab74b4 100644 (file)
--- a/lib/libzfs/Makefile.in
+++ b/lib/libzfs/Makefile.in
@@ -320,9 +320,10 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\"
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\"
 lib_LTLIBRARIES = libzfs.la
 libzfs_la_LDFLAGS = -lm -ldl $(LIBSELINUX)
 libzfs_la_LIBADD = \

diff --git a/lib/libzpool/Makefile.in b/lib/libzpool/Makefile.in
index 39feb9d27a86f9e373aabb9db9a238d3e921839c..56b449365200f7f3a29098e3c9cde540ee287352 100644 (file)
--- a/lib/libzpool/Makefile.in
+++ b/lib/libzpool/Makefile.in
@@ -331,10 +331,11 @@ DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h \
        -I$(top_srcdir)/include -I$(top_srcdir)/lib/libspl/include
 AM_LIBTOOLFLAGS = --silent
 AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing \
-       ${DEBUG_CFLAGS} -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT \
-       -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64 \
-       -D_LARGEFILE64_SOURCE -DTEXT_DOMAIN=\"zfs-linux-user\" \
-       $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
+       -Wno-unused-but-set-variable ${DEBUG_CFLAGS} -D_GNU_SOURCE \
+       -D__EXTENSIONS__ -D_REENTRANT -D_POSIX_PTHREAD_SEMANTICS \
+       -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE \
+       -DTEXT_DOMAIN=\"zfs-linux-user\" $(DEBUG_STACKFLAGS) \
+       $(FRAME_LARGER_THAN)
 lib_LTLIBRARIES = libzpool.la
 libzpool_la_LIBADD = \
        $(top_builddir)/lib/libunicode/libunicode.la \