summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Behlendorf <[email protected]>2009-03-11 13:14:08 -0700
committerBrian Behlendorf <[email protected]>2009-03-11 13:14:08 -0700
commit4e945fb7680b9b3a3e39966bcd37114021e54866 (patch)
tree3564e1d7bbd07a29e26b026395d7e131347b0f46
parent0cad1eaf4088e152e58dacc0c7f63bce90592b38 (diff)
Remove -Wno-unknown-pragmas compile option, all unknown pragmas
have been removed by the gcc-ident-pragmas topic branch.
-rw-r--r--config/Rules.am3
-rw-r--r--config/kernel.m48
-rw-r--r--module/Makefile.in3
3 files changed, 7 insertions, 7 deletions
diff --git a/config/Rules.am b/config/Rules.am
index 258c94a7f..7ed117657 100644
--- a/config/Rules.am
+++ b/config/Rules.am
@@ -5,9 +5,8 @@ DEFAULT_INCLUDES = -I${top_srcdir}
#
# FIXME: Add -Wshadow once everything is working
#
-AM_CFLAGS = -Wall -Wstrict-prototypes -Werror
+AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-parentheses
AM_CFLAGS += -Wno-switch -Wno-unused -Wno-missing-braces
-AM_CFLAGS += -Wno-unknown-pragmas -Wno-parentheses
AM_CFLAGS += -Wno-uninitialized -fno-strict-aliasing
# Expected defines not covered by zfs_config.h or spl_config.h
diff --git a/config/kernel.m4 b/config/kernel.m4
index 708957e35..4a705b0e5 100644
--- a/config/kernel.m4
+++ b/config/kernel.m4
@@ -8,10 +8,10 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
# FIXME: Quiet warnings not covered by the gcc-* patches. We should
# FIXME: consider removing this as soon as we reasonably can
- KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror "
- KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch -Wno-unused -Wno-missing-braces "
- KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-unknown-pragmas -Wno-parentheses "
- KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing "
+ KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror"
+ KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch -Wno-unused"
+ KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-missing-braces -Wno-parentheses"
+ KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing"
KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL "
KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\" "
diff --git a/module/Makefile.in b/module/Makefile.in
index 2dfd043cb..c9c4f57c5 100644
--- a/module/Makefile.in
+++ b/module/Makefile.in
@@ -10,7 +10,8 @@ modules clean:
$(MAKE) -C @LINUX@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
modules_install:
- $(MAKE) -C @LINUX@ SUBDIRS=`pwd` INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=addon $@
+ $(MAKE) -C @LINUX@ SUBDIRS=`pwd` \
+ INSTALL_MOD_PATH=$(DESTDIR) INSTALL_MOD_DIR=addon $@
# Install the required headers in to the kernel source
(mkdir -p $(DESTDIR)/@LINUX@/include/zfs && \
find . -mindepth 3 -maxdepth 3 -name '*.h' | \