Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-legacy' into linux-legacy

This commit is contained in:
Brian Behlendorf 2009-03-12 11:03:57 -07:00
parent 8bd00f4aa5 74432ad2fb
commit d3f1b98b71
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
config/Rules.am
View File

@ -1,8 +1,7 @@
DEFAULT_INCLUDES = -I${top_srcdir} DEFAULT_INCLUDES = -I${top_srcdir}
# FIXME: Add -Wshadow once everything is working # FIXME: Add -Wshadow once everything is working
AM_CFLAGS = -Wall -Wstrict-prototypes -Werror -Wno-switch AM_CFLAGS = -Wall -Wstrict-prototypes -fno-strict-aliasing -Werror
AM_CFLAGS += -Wno-uninitialized -fno-strict-aliasing
# Expected defines not covered by zfs_config.h or spl_config.h # Expected defines not covered by zfs_config.h or spl_config.h
AM_CFLAGS += -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT AM_CFLAGS += -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT

9
config/kernel.m4
View File

@ -6,13 +6,10 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
dnl # KERNELMAKE_PARAMS="V=1" # Enable verbose module build dnl # KERNELMAKE_PARAMS="V=1" # Enable verbose module build
KERNELMAKE_PARAMS= KERNELMAKE_PARAMS=
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wall -Wstrict-prototypes -Werror" dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-switch" dnl # compiler options are added by the kernel build system.
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-uninitialized -fno-strict-aliasing" KERNELCPPFLAGS="$KERNELCPPFLAGS -Werror -DHAVE_SPL -D_KERNEL"
KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\"" KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
KERNELCPPFLAGS="$KERNELCPPFLAGS -I$splsrc -I$splsrc/include -I$TOPDIR" KERNELCPPFLAGS="$KERNELCPPFLAGS -I$splsrc -I$splsrc/include -I$TOPDIR"
if test "$kernelbuild" != "$kernelsrc"; then if test "$kernelbuild" != "$kernelsrc"; then