mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2024-12-27 11:29:36 +03:00
Support -fsanitize=address with --enable-asan
When --enable-asan is provided to configure then build all user space components with fsanitize=address. For kernel support use the Linux KASAN feature instead. https://github.com/google/sanitizers/wiki/AddressSanitizer When using gcc version 4.8 any test case which intentionally generates a core dump will fail when using --enable-asan. The default behavior is to disable core dumps and only newer versions allow this behavior to be controled at run time with the ASAN_OPTIONS environment variable. Additionally, this patch includes some build system cleanup. * Rules.am updated to set the minimum AM_CFLAGS, AM_CPPFLAGS, and AM_LDFLAGS. Any additional flags should be added on a per-Makefile basic. The --enable-debug and --enable-asan options apply to all user space binaries and libraries. * Compiler checks consolidated in always-compiler-options.m4 and renamed for consistency. * -fstack-check compiler flag was removed, this functionality is provided by asan when configured with --enable-asan. * Split DEBUG_CFLAGS in to DEBUG_CFLAGS, DEBUG_CPPFLAGS, and DEBUG_LDFLAGS. * Moved default kernel build flags in to module/Makefile.in and split in to ZFS_MODULE_CFLAGS and ZFS_MODULE_CPPFLAGS. These flags are set with the standard ccflags-y kbuild mechanism. * -Wframe-larger-than checks applied only to binaries or libraries which include source files which are built in both user space and kernel space. This restriction is relaxed for user space only utilities. * -Wno-unused-but-set-variable applied only to libzfs and libzpool. The remaining warnings are the result of an ASSERT using a variable when is always declared. * -D_POSIX_PTHREAD_SEMANTICS and -D__EXTENSIONS__ dropped because they are Solaris specific and thus not needed. * Ensure $GDB is defined as gdb by default in zloop.sh. Signed-off-by: DHE <git@dehacked.net> Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov> Closes #7027
This commit is contained in:
parent
7e7f513277
commit
fed90353d7
@ -1,7 +1,10 @@
|
|||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
|
# Includes kernel code, generate warnings for large stack frames
|
||||||
AM_CPPFLAGS += -DDEBUG
|
AM_CFLAGS += $(FRAME_LARGER_THAN)
|
||||||
|
|
||||||
|
# Unconditionally enable ASSERTs
|
||||||
|
AM_CPPFLAGS += -DDEBUG -UNDEBUG
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
|
@ -1,6 +1,7 @@
|
|||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
AM_CPPFLAGS += -DDEBUG
|
# Unconditionally enable debugging for zdb
|
||||||
|
AM_CPPFLAGS += -DDEBUG -UNDEBUG
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
|
@ -1,8 +1,12 @@
|
|||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
# -Wnoformat-truncation to get rid of compiler warning for unchecked
|
# Get rid of compiler warning for unchecked truncating snprintfs on gcc 7.1.1
|
||||||
# truncating snprintfs on gcc 7.1.1.
|
AM_CFLAGS += $(NO_FORMAT_TRUNCATION)
|
||||||
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) $(NO_FORMAT_TRUNCATION)
|
|
||||||
|
# Includes kernel code, generate warnings for large stack frames
|
||||||
|
AM_CFLAGS += $(FRAME_LARGER_THAN)
|
||||||
|
|
||||||
|
# Unconditionally enable ASSERTs
|
||||||
AM_CPPFLAGS += -DDEBUG -UNDEBUG
|
AM_CPPFLAGS += -DDEBUG -UNDEBUG
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
|
@ -1,18 +1,29 @@
|
|||||||
|
#
|
||||||
|
# Default build rules for all user space components, every Makefile.am
|
||||||
|
# should include these rules and override or extend them as needed.
|
||||||
|
#
|
||||||
|
|
||||||
DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h
|
DEFAULT_INCLUDES = -include ${top_builddir}/zfs_config.h
|
||||||
|
|
||||||
AM_LIBTOOLFLAGS = --silent
|
AM_LIBTOOLFLAGS = --silent
|
||||||
AM_CFLAGS = ${DEBUG_CFLAGS} -Wall -Wstrict-prototypes
|
|
||||||
AM_CFLAGS += ${NO_UNUSED_BUT_SET_VARIABLE}
|
AM_CFLAGS = -std=gnu99 -Wall -Wstrict-prototypes -fno-strict-aliasing
|
||||||
AM_CFLAGS += ${NO_BOOL_COMPARE}
|
AM_CFLAGS += $(DEBUG_CFLAGS)
|
||||||
AM_CFLAGS += -fno-strict-aliasing
|
AM_CFLAGS += $(ASAN_CFLAGS)
|
||||||
AM_CFLAGS += -std=gnu99
|
|
||||||
AM_CFLAGS += $(CODE_COVERAGE_CFLAGS)
|
AM_CFLAGS += $(CODE_COVERAGE_CFLAGS)
|
||||||
AM_CPPFLAGS = -D_GNU_SOURCE -D__EXTENSIONS__ -D_REENTRANT
|
|
||||||
AM_CPPFLAGS += -D_POSIX_PTHREAD_SEMANTICS -D_FILE_OFFSET_BITS=64
|
AM_CPPFLAGS = -D_GNU_SOURCE
|
||||||
AM_CPPFLAGS += -D_LARGEFILE64_SOURCE -DHAVE_LARGE_STACKS=1
|
AM_CPPFLAGS += -D_REENTRANT
|
||||||
|
AM_CPPFLAGS += -D_FILE_OFFSET_BITS=64
|
||||||
|
AM_CPPFLAGS += -D_LARGEFILE64_SOURCE
|
||||||
|
AM_CPPFLAGS += -DHAVE_LARGE_STACKS=1
|
||||||
AM_CPPFLAGS += -DTEXT_DOMAIN=\"zfs-linux-user\"
|
AM_CPPFLAGS += -DTEXT_DOMAIN=\"zfs-linux-user\"
|
||||||
AM_CPPFLAGS += -DLIBEXECDIR=\"$(libexecdir)\"
|
AM_CPPFLAGS += -DLIBEXECDIR=\"$(libexecdir)\"
|
||||||
AM_CPPFLAGS += -DRUNSTATEDIR=\"$(runstatedir)\"
|
AM_CPPFLAGS += -DRUNSTATEDIR=\"$(runstatedir)\"
|
||||||
AM_CPPFLAGS += -DSBINDIR=\"$(sbindir)\"
|
AM_CPPFLAGS += -DSBINDIR=\"$(sbindir)\"
|
||||||
AM_CPPFLAGS += -DSYSCONFDIR=\"$(sysconfdir)\"
|
AM_CPPFLAGS += -DSYSCONFDIR=\"$(sysconfdir)\"
|
||||||
|
AM_CPPFLAGS += $(DEBUG_CPPFLAGS)
|
||||||
AM_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS)
|
AM_CPPFLAGS += $(CODE_COVERAGE_CPPFLAGS)
|
||||||
|
|
||||||
|
AM_LDFLAGS = $(DEBUG_LDFLAGS)
|
||||||
|
AM_LDFLAGS += $(ASAN_LDFLAGS)
|
||||||
|
141
config/always-compiler-options.m4
Normal file
141
config/always-compiler-options.m4
Normal file
@ -0,0 +1,141 @@
|
|||||||
|
dnl #
|
||||||
|
dnl # Enabled -fsanitize=address if supported by gcc.
|
||||||
|
dnl #
|
||||||
|
dnl # LDFLAGS needs -fsanitize=address at all times so libraries compiled with
|
||||||
|
dnl # it will be linked successfully. CFLAGS will vary by binary being built.
|
||||||
|
dnl #
|
||||||
|
dnl # The ASAN_OPTIONS environment variable can be used to further control
|
||||||
|
dnl # the behavior of binaries and libraries build with -fsanitize=address.
|
||||||
|
dnl #
|
||||||
|
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_ASAN], [
|
||||||
|
AC_MSG_CHECKING([whether to build with -fsanitize=address support])
|
||||||
|
AC_ARG_ENABLE([asan],
|
||||||
|
[AS_HELP_STRING([--enable-asan],
|
||||||
|
[Enable -fsanitize=address support @<:@default=no@:>@])],
|
||||||
|
[],
|
||||||
|
[enable_asan=no])
|
||||||
|
|
||||||
|
AM_CONDITIONAL([ASAN_ENABLED], [test x$enable_asan = xyes])
|
||||||
|
AC_SUBST([ASAN_ENABLED], [$enable_asan])
|
||||||
|
AC_MSG_RESULT($enable_asan)
|
||||||
|
|
||||||
|
AS_IF([ test "$enable_asan" = "yes" ], [
|
||||||
|
AC_MSG_CHECKING([whether $CC supports -fsanitize=address])
|
||||||
|
saved_cflags="$CFLAGS"
|
||||||
|
CFLAGS="$CFLAGS -fsanitize=address"
|
||||||
|
AC_LINK_IFELSE([
|
||||||
|
AC_LANG_SOURCE([[ int main() { return 0; } ]])
|
||||||
|
], [
|
||||||
|
ASAN_CFLAGS="-fsanitize=address"
|
||||||
|
ASAN_LDFLAGS="-fsanitize=address"
|
||||||
|
ASAN_ZFS="_with_asan"
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
], [
|
||||||
|
AC_MSG_ERROR([$CC does not support -fsanitize=address])
|
||||||
|
])
|
||||||
|
CFLAGS="$saved_cflags"
|
||||||
|
], [
|
||||||
|
ASAN_CFLAGS=""
|
||||||
|
ASAN_LDFLAGS=""
|
||||||
|
ASAN_ZFS="_without_asan"
|
||||||
|
])
|
||||||
|
|
||||||
|
AC_SUBST([ASAN_CFLAGS])
|
||||||
|
AC_SUBST([ASAN_LDFLAGS])
|
||||||
|
AC_SUBST([ASAN_ZFS])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl #
|
||||||
|
dnl # Check if gcc supports -Wframe-larger-than=<size> option.
|
||||||
|
dnl #
|
||||||
|
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_FRAME_LARGER_THAN], [
|
||||||
|
AC_MSG_CHECKING([whether $CC supports -Wframe-larger-than=<size>])
|
||||||
|
|
||||||
|
saved_flags="$CFLAGS"
|
||||||
|
CFLAGS="$CFLAGS -Wframe-larger-than=4096"
|
||||||
|
|
||||||
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
|
||||||
|
FRAME_LARGER_THAN="-Wframe-larger-than=4096"
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
], [
|
||||||
|
FRAME_LARGER_THAN=""
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
])
|
||||||
|
|
||||||
|
CFLAGS="$saved_flags"
|
||||||
|
AC_SUBST([FRAME_LARGER_THAN])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl #
|
||||||
|
dnl # Check if gcc supports -Wno-format-truncation option.
|
||||||
|
dnl #
|
||||||
|
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_TRUNCATION], [
|
||||||
|
AC_MSG_CHECKING([whether $CC supports -Wno-format-truncation])
|
||||||
|
|
||||||
|
saved_flags="$CFLAGS"
|
||||||
|
CFLAGS="$CFLAGS -Wno-format-truncation"
|
||||||
|
|
||||||
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
|
||||||
|
NO_FORMAT_TRUNCATION=-Wno-format-truncation
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
], [
|
||||||
|
NO_FORMAT_TRUNCATION=
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
])
|
||||||
|
|
||||||
|
CFLAGS="$saved_flags"
|
||||||
|
AC_SUBST([NO_FORMAT_TRUNCATION])
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
|
dnl #
|
||||||
|
dnl # Check if gcc supports -Wno-bool-compare option.
|
||||||
|
dnl #
|
||||||
|
dnl # We actually invoke gcc with the -Wbool-compare option
|
||||||
|
dnl # and infer the 'no-' version does or doesn't exist based upon
|
||||||
|
dnl # the results. This is required because when checking any of
|
||||||
|
dnl # no- prefixed options gcc always returns success.
|
||||||
|
dnl #
|
||||||
|
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE], [
|
||||||
|
AC_MSG_CHECKING([whether $CC supports -Wno-bool-compare])
|
||||||
|
|
||||||
|
saved_flags="$CFLAGS"
|
||||||
|
CFLAGS="$CFLAGS -Wbool-compare"
|
||||||
|
|
||||||
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
|
||||||
|
NO_BOOL_COMPARE=-Wno-bool-compare
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
], [
|
||||||
|
NO_BOOL_COMPARE=
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
])
|
||||||
|
|
||||||
|
CFLAGS="$saved_flags"
|
||||||
|
AC_SUBST([NO_BOOL_COMPARE])
|
||||||
|
])
|
||||||
|
|
||||||
|
dnl #
|
||||||
|
dnl # Check if gcc supports -Wno-unused-but-set-variable option.
|
||||||
|
dnl #
|
||||||
|
dnl # We actually invoke gcc with the -Wunused-but-set-variable option
|
||||||
|
dnl # and infer the 'no-' version does or doesn't exist based upon
|
||||||
|
dnl # the results. This is required because when checking any of
|
||||||
|
dnl # no- prefixed options gcc always returns success.
|
||||||
|
dnl #
|
||||||
|
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_CC_NO_UNUSED_BUT_SET_VARIABLE], [
|
||||||
|
AC_MSG_CHECKING([whether $CC supports -Wno-unused-but-set-variable])
|
||||||
|
|
||||||
|
saved_flags="$CFLAGS"
|
||||||
|
CFLAGS="$CFLAGS -Wunused-but-set-variable"
|
||||||
|
|
||||||
|
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])], [
|
||||||
|
NO_UNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable
|
||||||
|
AC_MSG_RESULT([yes])
|
||||||
|
], [
|
||||||
|
NO_UNUSED_BUT_SET_VARIABLE=
|
||||||
|
AC_MSG_RESULT([no])
|
||||||
|
])
|
||||||
|
|
||||||
|
CFLAGS="$saved_flags"
|
||||||
|
AC_SUBST([NO_UNUSED_BUT_SET_VARIABLE])
|
||||||
|
])
|
@ -1,27 +0,0 @@
|
|||||||
dnl #
|
|
||||||
dnl # Check if gcc supports -Wno-bool-compare option.
|
|
||||||
dnl #
|
|
||||||
dnl # We actually invoke gcc with the -Wbool-compare option
|
|
||||||
dnl # and infer the 'no-' version does or doesn't exist based upon
|
|
||||||
dnl # the results. This is required because when checking any of
|
|
||||||
dnl # no- prefixed options gcc always returns success.
|
|
||||||
dnl #
|
|
||||||
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_NO_BOOL_COMPARE], [
|
|
||||||
AC_MSG_CHECKING([for -Wno-bool-compare support])
|
|
||||||
|
|
||||||
saved_flags="$CFLAGS"
|
|
||||||
CFLAGS="$CFLAGS -Wbool-compare"
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])],
|
|
||||||
[
|
|
||||||
NO_BOOL_COMPARE=-Wno-bool-compare
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
],
|
|
||||||
[
|
|
||||||
NO_BOOL_COMPARE=
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
])
|
|
||||||
|
|
||||||
CFLAGS="$saved_flags"
|
|
||||||
AC_SUBST([NO_BOOL_COMPARE])
|
|
||||||
])
|
|
@ -1,27 +0,0 @@
|
|||||||
dnl #
|
|
||||||
dnl # Check if gcc supports -Wno-unused-but-set-variable option.
|
|
||||||
dnl #
|
|
||||||
dnl # We actually invoke gcc with the -Wunused-but-set-variable option
|
|
||||||
dnl # and infer the 'no-' version does or doesn't exist based upon
|
|
||||||
dnl # the results. This is required because when checking any of
|
|
||||||
dnl # no- prefixed options gcc always returns success.
|
|
||||||
dnl #
|
|
||||||
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE], [
|
|
||||||
AC_MSG_CHECKING([for -Wno-unused-but-set-variable support])
|
|
||||||
|
|
||||||
saved_flags="$CFLAGS"
|
|
||||||
CFLAGS="$CFLAGS -Wunused-but-set-variable"
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])],
|
|
||||||
[
|
|
||||||
NO_UNUSED_BUT_SET_VARIABLE=-Wno-unused-but-set-variable
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
],
|
|
||||||
[
|
|
||||||
NO_UNUSED_BUT_SET_VARIABLE=
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
])
|
|
||||||
|
|
||||||
CFLAGS="$saved_flags"
|
|
||||||
AC_SUBST([NO_UNUSED_BUT_SET_VARIABLE])
|
|
||||||
])
|
|
@ -125,21 +125,10 @@ AC_DEFUN([ZFS_AC_CONFIG_KERNEL], [
|
|||||||
ZFS_AC_KERNEL_VM_NODE_STAT
|
ZFS_AC_KERNEL_VM_NODE_STAT
|
||||||
|
|
||||||
AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
|
AS_IF([test "$LINUX_OBJ" != "$LINUX"], [
|
||||||
KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS O=$LINUX_OBJ"
|
KERNEL_MAKE="$KERNEL_MAKE O=$LINUX_OBJ"
|
||||||
])
|
])
|
||||||
AC_SUBST(KERNELMAKE_PARAMS)
|
|
||||||
|
|
||||||
|
AC_SUBST(KERNEL_MAKE)
|
||||||
dnl # -Wall -fno-strict-aliasing -Wstrict-prototypes and other
|
|
||||||
dnl # compiler options are added by the kernel build system.
|
|
||||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -std=gnu99"
|
|
||||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -Wno-declaration-after-statement"
|
|
||||||
KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_UNUSED_BUT_SET_VARIABLE"
|
|
||||||
KERNELCPPFLAGS="$KERNELCPPFLAGS $NO_BOOL_COMPARE"
|
|
||||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -DHAVE_SPL -D_KERNEL"
|
|
||||||
KERNELCPPFLAGS="$KERNELCPPFLAGS -DTEXT_DOMAIN=\\\"zfs-linux-kernel\\\""
|
|
||||||
|
|
||||||
AC_SUBST(KERNELCPPFLAGS)
|
|
||||||
])
|
])
|
||||||
|
|
||||||
dnl #
|
dnl #
|
||||||
|
@ -1,22 +0,0 @@
|
|||||||
dnl #
|
|
||||||
dnl # Check if gcc supports -Wframe-larger-than=<size> option.
|
|
||||||
dnl #
|
|
||||||
AC_DEFUN([ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN], [
|
|
||||||
AC_MSG_CHECKING([for -Wframe-larger-than=<size> support])
|
|
||||||
|
|
||||||
saved_flags="$CFLAGS"
|
|
||||||
CFLAGS="$CFLAGS -Wframe-larger-than=1024"
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])],
|
|
||||||
[
|
|
||||||
FRAME_LARGER_THAN=-Wframe-larger-than=1024
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
],
|
|
||||||
[
|
|
||||||
FRAME_LARGER_THAN=
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
])
|
|
||||||
|
|
||||||
CFLAGS="$saved_flags"
|
|
||||||
AC_SUBST([FRAME_LARGER_THAN])
|
|
||||||
])
|
|
@ -1,22 +0,0 @@
|
|||||||
dnl #
|
|
||||||
dnl # Check if gcc supports -Wno-format-truncation option.
|
|
||||||
dnl #
|
|
||||||
AC_DEFUN([ZFS_AC_CONFIG_USER_NO_FORMAT_TRUNCATION], [
|
|
||||||
AC_MSG_CHECKING([for -Wno-format-truncation support])
|
|
||||||
|
|
||||||
saved_flags="$CFLAGS"
|
|
||||||
CFLAGS="$CFLAGS -Wno-format-truncation"
|
|
||||||
|
|
||||||
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([], [])],
|
|
||||||
[
|
|
||||||
NO_FORMAT_TRUNCATION=-Wno-format-truncation
|
|
||||||
AC_MSG_RESULT([yes])
|
|
||||||
],
|
|
||||||
[
|
|
||||||
NO_FORMAT_TRUNCATION=
|
|
||||||
AC_MSG_RESULT([no])
|
|
||||||
])
|
|
||||||
|
|
||||||
CFLAGS="$saved_flags"
|
|
||||||
AC_SUBST([NO_FORMAT_TRUNCATION])
|
|
||||||
])
|
|
@ -14,11 +14,9 @@ AC_DEFUN([ZFS_AC_CONFIG_USER], [
|
|||||||
ZFS_AC_CONFIG_USER_LIBATTR
|
ZFS_AC_CONFIG_USER_LIBATTR
|
||||||
ZFS_AC_CONFIG_USER_LIBUDEV
|
ZFS_AC_CONFIG_USER_LIBUDEV
|
||||||
ZFS_AC_CONFIG_USER_LIBSSL
|
ZFS_AC_CONFIG_USER_LIBSSL
|
||||||
ZFS_AC_CONFIG_USER_FRAME_LARGER_THAN
|
|
||||||
ZFS_AC_CONFIG_USER_RUNSTATEDIR
|
ZFS_AC_CONFIG_USER_RUNSTATEDIR
|
||||||
ZFS_AC_CONFIG_USER_MAKEDEV_IN_SYSMACROS
|
ZFS_AC_CONFIG_USER_MAKEDEV_IN_SYSMACROS
|
||||||
ZFS_AC_CONFIG_USER_MAKEDEV_IN_MKDEV
|
ZFS_AC_CONFIG_USER_MAKEDEV_IN_MKDEV
|
||||||
ZFS_AC_CONFIG_USER_NO_FORMAT_TRUNCATION
|
|
||||||
|
|
||||||
ZFS_AC_TEST_FRAMEWORK
|
ZFS_AC_TEST_FRAMEWORK
|
||||||
|
|
||||||
|
@ -7,27 +7,36 @@ AC_DEFUN([ZFS_AC_LICENSE], [
|
|||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([ZFS_AC_DEBUG_ENABLE], [
|
AC_DEFUN([ZFS_AC_DEBUG_ENABLE], [
|
||||||
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror"
|
DEBUG_CFLAGS="-Werror"
|
||||||
HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror"
|
DEBUG_CPPFLAGS="-DDEBUG -UNDEBUG"
|
||||||
DEBUG_CFLAGS="-DDEBUG -Werror"
|
DEBUG_LDFLAGS=""
|
||||||
DEBUG_STACKFLAGS="-fstack-check"
|
|
||||||
DEBUG_ZFS="_with_debug"
|
DEBUG_ZFS="_with_debug"
|
||||||
AC_DEFINE(ZFS_DEBUG, 1, [zfs debugging enabled])
|
AC_DEFINE(ZFS_DEBUG, 1, [zfs debugging enabled])
|
||||||
|
|
||||||
|
KERNEL_DEBUG_CFLAGS="-Werror"
|
||||||
|
KERNEL_DEBUG_CPPFLAGS="-DDEBUG -UNDEBUG"
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([ZFS_AC_DEBUG_DISABLE], [
|
AC_DEFUN([ZFS_AC_DEBUG_DISABLE], [
|
||||||
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
|
DEBUG_CFLAGS=""
|
||||||
HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
|
DEBUG_CPPFLAGS="-UDEBUG -DNDEBUG"
|
||||||
DEBUG_CFLAGS="-DNDEBUG"
|
DEBUG_LDFLAGS=""
|
||||||
DEBUG_STACKFLAGS=""
|
|
||||||
DEBUG_ZFS="_without_debug"
|
DEBUG_ZFS="_without_debug"
|
||||||
|
|
||||||
|
KERNEL_DEBUG_CFLAGS=""
|
||||||
|
KERNEL_DEBUG_CPPFLAGS="-UDEBUG -DNDEBUG"
|
||||||
])
|
])
|
||||||
|
|
||||||
|
dnl #
|
||||||
|
dnl # When debugging is enabled:
|
||||||
|
dnl # - Enable all ASSERTs (-DDEBUG)
|
||||||
|
dnl # - Promote all compiler warnings to errors (-Werror)
|
||||||
|
dnl #
|
||||||
AC_DEFUN([ZFS_AC_DEBUG], [
|
AC_DEFUN([ZFS_AC_DEBUG], [
|
||||||
AC_MSG_CHECKING([whether assertion support will be enabled])
|
AC_MSG_CHECKING([whether assertion support will be enabled])
|
||||||
AC_ARG_ENABLE([debug],
|
AC_ARG_ENABLE([debug],
|
||||||
[AS_HELP_STRING([--enable-debug],
|
[AS_HELP_STRING([--enable-debug],
|
||||||
[Enable assertion support @<:@default=no@:>@])],
|
[Enable compiler and code assertions @<:@default=no@:>@])],
|
||||||
[],
|
[],
|
||||||
[enable_debug=no])
|
[enable_debug=no])
|
||||||
|
|
||||||
@ -38,18 +47,28 @@ AC_DEFUN([ZFS_AC_DEBUG], [
|
|||||||
[ZFS_AC_DEBUG_DISABLE],
|
[ZFS_AC_DEBUG_DISABLE],
|
||||||
[AC_MSG_ERROR([Unknown option $enable_debug])])
|
[AC_MSG_ERROR([Unknown option $enable_debug])])
|
||||||
|
|
||||||
AC_SUBST(DEBUG_STACKFLAGS)
|
AC_SUBST(DEBUG_CFLAGS)
|
||||||
|
AC_SUBST(DEBUG_CPPFLAGS)
|
||||||
|
AC_SUBST(DEBUG_LDFLAGS)
|
||||||
AC_SUBST(DEBUG_ZFS)
|
AC_SUBST(DEBUG_ZFS)
|
||||||
|
|
||||||
|
AC_SUBST(KERNEL_DEBUG_CFLAGS)
|
||||||
|
AC_SUBST(KERNEL_DEBUG_CPPFLAGS)
|
||||||
|
|
||||||
AC_MSG_RESULT([$enable_debug])
|
AC_MSG_RESULT([$enable_debug])
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([ZFS_AC_DEBUGINFO_KERNEL], [
|
AC_DEFUN([ZFS_AC_DEBUGINFO_ENABLE], [
|
||||||
KERNELMAKE_PARAMS="$KERNELMAKE_PARAMS CONFIG_DEBUG_INFO=y"
|
DEBUG_CFLAGS="$DEBUG_CFLAGS -g -fno-inline"
|
||||||
KERNELCPPFLAGS="${KERNELCPPFLAGS} -fno-inline"
|
|
||||||
|
KERNEL_DEBUG_CFLAGS="$KERNEL_DEBUG_CFLAGS -fno-inline"
|
||||||
|
KERNEL_MAKE="$KERNEL_MAKE CONFIG_DEBUG_INFO=y"
|
||||||
|
|
||||||
|
DEBUGINFO_ZFS="_with_debuginfo"
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([ZFS_AC_DEBUGINFO_USER], [
|
AC_DEFUN([ZFS_AC_DEBUGINFO_DISABLE], [
|
||||||
DEBUG_CFLAGS="${DEBUG_CFLAGS} -g -fno-inline"
|
DEBUGINFO_ZFS="_without_debuginfo"
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([ZFS_AC_DEBUGINFO], [
|
AC_DEFUN([ZFS_AC_DEBUGINFO], [
|
||||||
@ -62,23 +81,26 @@ AC_DEFUN([ZFS_AC_DEBUGINFO], [
|
|||||||
|
|
||||||
AS_CASE(["x$enable_debuginfo"],
|
AS_CASE(["x$enable_debuginfo"],
|
||||||
["xyes"],
|
["xyes"],
|
||||||
[ZFS_AC_DEBUGINFO_KERNEL
|
[ZFS_AC_DEBUGINFO_ENABLE],
|
||||||
ZFS_AC_DEBUGINFO_USER],
|
|
||||||
["xkernel"],
|
|
||||||
[ZFS_AC_DEBUGINFO_KERNEL],
|
|
||||||
["xuser"],
|
|
||||||
[ZFS_AC_DEBUGINFO_USER],
|
|
||||||
["xno"],
|
["xno"],
|
||||||
[],
|
[ZFS_AC_DEBUGINFO_DISABLE],
|
||||||
[AC_MSG_ERROR([Unknown option $enable_debug])])
|
[AC_MSG_ERROR([Unknown option $enable_debuginfo])])
|
||||||
|
|
||||||
AC_SUBST(DEBUG_CFLAGS)
|
AC_SUBST(DEBUG_CFLAGS)
|
||||||
|
AC_SUBST(DEBUGINFO_ZFS)
|
||||||
|
|
||||||
|
AC_SUBST(KERNEL_DEBUG_CFLAGS)
|
||||||
|
AC_SUBST(KERNEL_MAKE)
|
||||||
|
|
||||||
AC_MSG_RESULT([$enable_debuginfo])
|
AC_MSG_RESULT([$enable_debuginfo])
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
|
AC_DEFUN([ZFS_AC_CONFIG_ALWAYS], [
|
||||||
ZFS_AC_CONFIG_ALWAYS_NO_UNUSED_BUT_SET_VARIABLE
|
ZFS_AC_CONFIG_ALWAYS_CC_NO_UNUSED_BUT_SET_VARIABLE
|
||||||
ZFS_AC_CONFIG_ALWAYS_NO_BOOL_COMPARE
|
ZFS_AC_CONFIG_ALWAYS_CC_NO_BOOL_COMPARE
|
||||||
|
ZFS_AC_CONFIG_ALWAYS_CC_FRAME_LARGER_THAN
|
||||||
|
ZFS_AC_CONFIG_ALWAYS_CC_NO_FORMAT_TRUNCATION
|
||||||
|
ZFS_AC_CONFIG_ALWAYS_CC_ASAN
|
||||||
ZFS_AC_CONFIG_ALWAYS_TOOLCHAIN_SIMD
|
ZFS_AC_CONFIG_ALWAYS_TOOLCHAIN_SIMD
|
||||||
ZFS_AC_CONFIG_ALWAYS_ARCH
|
ZFS_AC_CONFIG_ALWAYS_ARCH
|
||||||
])
|
])
|
||||||
@ -160,9 +182,23 @@ AC_DEFUN([ZFS_AC_RPM], [
|
|||||||
])
|
])
|
||||||
|
|
||||||
RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"'
|
RPM_DEFINE_COMMON='--define "$(DEBUG_ZFS) 1"'
|
||||||
RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)" --define "_udevdir $(udevdir)" --define "_udevruledir $(udevruledir)" --define "_initconfdir $(DEFAULT_INITCONF_DIR)" $(DEFINE_INITRAMFS) $(DEFINE_SYSTEMD)'
|
RPM_DEFINE_COMMON+=' --define "$(DEBUGINFO_ZFS) 1"'
|
||||||
RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)" --define "require_spldir $(SPL)" --define "require_splobj $(SPL_OBJ)" --define "ksrc $(LINUX)" --define "kobj $(LINUX_OBJ)"'
|
RPM_DEFINE_COMMON+=' --define "$(ASAN_ZFS) 1"'
|
||||||
RPM_DEFINE_DKMS=
|
|
||||||
|
RPM_DEFINE_UTIL='--define "_dracutdir $(dracutdir)"'
|
||||||
|
RPM_DEFINE_UTIL+=' --define "_udevdir $(udevdir)"'
|
||||||
|
RPM_DEFINE_UTIL+=' --define "_udevruledir $(udevruledir)"'
|
||||||
|
RPM_DEFINE_UTIL+=' --define "_initconfdir $(DEFAULT_INITCONF_DIR)"'
|
||||||
|
RPM_DEFINE_UTIL+=' $(DEFINE_INITRAMFS)'
|
||||||
|
RPM_DEFINE_UTIL+=' $(DEFINE_SYSTEMD)'
|
||||||
|
|
||||||
|
RPM_DEFINE_KMOD='--define "kernels $(LINUX_VERSION)"'
|
||||||
|
RPM_DEFINE_KMOD+=' --define "require_spldir $(SPL)"'
|
||||||
|
RPM_DEFINE_KMOD+=' --define "require_splobj $(SPL_OBJ)"'
|
||||||
|
RPM_DEFINE_KMOD+=' --define "ksrc $(LINUX)"'
|
||||||
|
RPM_DEFINE_KMOD+=' --define "kobj $(LINUX_OBJ)"'
|
||||||
|
|
||||||
|
RPM_DEFINE_DKMS=''
|
||||||
|
|
||||||
SRPM_DEFINE_COMMON='--define "build_src_rpm 1"'
|
SRPM_DEFINE_COMMON='--define "build_src_rpm 1"'
|
||||||
SRPM_DEFINE_UTIL=
|
SRPM_DEFINE_UTIL=
|
||||||
|
@ -2,7 +2,8 @@ include $(top_srcdir)/config/Rules.am
|
|||||||
|
|
||||||
VPATH = $(top_srcdir)/module/avl/
|
VPATH = $(top_srcdir)/module/avl/
|
||||||
|
|
||||||
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
|
# Includes kernel code, generate warnings for large stack frames
|
||||||
|
AM_CFLAGS += $(FRAME_LARGER_THAN)
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
|
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
-I$(top_srcdir)/lib/libspl/include
|
-I$(top_srcdir)/lib/libspl/include
|
||||||
@ -11,11 +9,7 @@ noinst_LTLIBRARIES = libefi.la
|
|||||||
USER_C = \
|
USER_C = \
|
||||||
rdwr_efi.c
|
rdwr_efi.c
|
||||||
|
|
||||||
KERNEL_C =
|
nodist_libefi_la_SOURCES = $(USER_C)
|
||||||
|
|
||||||
nodist_libefi_la_SOURCES = \
|
|
||||||
$(USER_C) \
|
|
||||||
$(KERNEL_C)
|
|
||||||
|
|
||||||
libefi_la_LIBADD = $(LIBUUID)
|
libefi_la_LIBADD = $(LIBUUID)
|
||||||
|
|
||||||
|
@ -4,7 +4,8 @@ VPATH = \
|
|||||||
$(top_srcdir)/module/icp \
|
$(top_srcdir)/module/icp \
|
||||||
$(top_srcdir)/lib/libicp
|
$(top_srcdir)/lib/libicp
|
||||||
|
|
||||||
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
|
# Includes kernel code, generate warnings for large stack frames
|
||||||
|
AM_CFLAGS += $(FRAME_LARGER_THAN)
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
|
@ -4,7 +4,11 @@ VPATH = \
|
|||||||
$(top_srcdir)/module/nvpair \
|
$(top_srcdir)/module/nvpair \
|
||||||
$(top_srcdir)/lib/libnvpair
|
$(top_srcdir)/lib/libnvpair
|
||||||
|
|
||||||
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN) $(LIBTIRPC_CFLAGS)
|
# Required CFLAGS for libtirpc
|
||||||
|
AM_CFLAGS += $(LIBTIRPC_CFLAGS)
|
||||||
|
|
||||||
|
# Includes kernel code, generate warnings for large stack frames
|
||||||
|
AM_CFLAGS += $(FRAME_LARGER_THAN)
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
|
@ -14,10 +14,6 @@ USER_C = \
|
|||||||
smb.c \
|
smb.c \
|
||||||
smb.h
|
smb.h
|
||||||
|
|
||||||
KERNEL_C =
|
nodist_libshare_la_SOURCES = $(USER_C)
|
||||||
|
|
||||||
nodist_libshare_la_SOURCES = \
|
|
||||||
$(USER_C)
|
|
||||||
$(KERNEL_C)
|
|
||||||
|
|
||||||
EXTRA_DIST = $(USER_C)
|
EXTRA_DIST = $(USER_C)
|
||||||
|
@ -4,8 +4,6 @@ VPATH = \
|
|||||||
$(top_srcdir)/lib/libspl \
|
$(top_srcdir)/lib/libspl \
|
||||||
$(top_srcdir)/lib/libspl/$(TARGET_ASM_DIR)
|
$(top_srcdir)/lib/libspl/$(TARGET_ASM_DIR)
|
||||||
|
|
||||||
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
|
|
||||||
|
|
||||||
SUBDIRS = include $(TARGET_ASM_DIR)
|
SUBDIRS = include $(TARGET_ASM_DIR)
|
||||||
DIST_SUBDIRS = include asm-generic asm-i386 asm-x86_64
|
DIST_SUBDIRS = include asm-generic asm-i386 asm-x86_64
|
||||||
|
|
||||||
@ -36,12 +34,9 @@ USER_C = \
|
|||||||
|
|
||||||
USER_ASM = atomic.S
|
USER_ASM = atomic.S
|
||||||
|
|
||||||
KERNEL_C =
|
|
||||||
|
|
||||||
nodist_libspl_la_SOURCES = \
|
nodist_libspl_la_SOURCES = \
|
||||||
$(USER_C) \
|
$(USER_C) \
|
||||||
$(USER_ASM) \
|
$(USER_ASM)
|
||||||
$(KERNEL_C)
|
|
||||||
|
|
||||||
libspl_la_LIBADD = -lrt
|
libspl_la_LIBADD = -lrt
|
||||||
|
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
AM_CFLAGS += $(DEBUG_STACKFLAGS)
|
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
-I$(top_srcdir)/lib/libspl/include
|
-I$(top_srcdir)/lib/libspl/include
|
||||||
@ -12,11 +10,7 @@ USER_C = \
|
|||||||
thread_pool.c \
|
thread_pool.c \
|
||||||
thread_pool_impl.h
|
thread_pool_impl.h
|
||||||
|
|
||||||
KERNEL_C =
|
nodist_libtpool_la_SOURCES = $(USER_C)
|
||||||
|
|
||||||
nodist_libtpool_la_SOURCES = \
|
|
||||||
$(USER_C) \
|
|
||||||
$(KERNEL_C)
|
|
||||||
|
|
||||||
libtpool_la_LIBADD = \
|
libtpool_la_LIBADD = \
|
||||||
$(top_builddir)/lib/libspl/libspl.la
|
$(top_builddir)/lib/libspl/libspl.la
|
||||||
|
@ -2,7 +2,8 @@ include $(top_srcdir)/config/Rules.am
|
|||||||
|
|
||||||
VPATH = $(top_srcdir)/module/unicode
|
VPATH = $(top_srcdir)/module/unicode
|
||||||
|
|
||||||
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
|
# Includes kernel code, generate warnings for large stack frames
|
||||||
|
AM_CFLAGS += $(FRAME_LARGER_THAN)
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
|
@ -1,7 +1,5 @@
|
|||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
|
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
-I$(top_srcdir)/lib/libspl/include
|
-I$(top_srcdir)/lib/libspl/include
|
||||||
@ -19,11 +17,7 @@ USER_C = \
|
|||||||
uu_pname.c \
|
uu_pname.c \
|
||||||
uu_string.c
|
uu_string.c
|
||||||
|
|
||||||
KERNEL_C =
|
nodist_libuutil_la_SOURCES = $(USER_C)
|
||||||
|
|
||||||
nodist_libuutil_la_SOURCES = \
|
|
||||||
$(USER_C) \
|
|
||||||
$(KERNEL_C)
|
|
||||||
|
|
||||||
libuutil_la_LIBADD = \
|
libuutil_la_LIBADD = \
|
||||||
$(top_builddir)/lib/libavl/libavl.la \
|
$(top_builddir)/lib/libavl/libavl.la \
|
||||||
|
@ -5,6 +5,9 @@ VPATH = \
|
|||||||
$(top_srcdir)/module/zcommon \
|
$(top_srcdir)/module/zcommon \
|
||||||
$(top_srcdir)/lib/libzfs
|
$(top_srcdir)/lib/libzfs
|
||||||
|
|
||||||
|
# Suppress unused but set variable warnings often due to ASSERTs
|
||||||
|
AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
|
||||||
|
|
||||||
libzfs_pcdir = $(datarootdir)/pkgconfig
|
libzfs_pcdir = $(datarootdir)/pkgconfig
|
||||||
libzfs_pc_DATA = libzfs.pc libzfs_core.pc
|
libzfs_pc_DATA = libzfs.pc libzfs_core.pc
|
||||||
|
|
||||||
|
@ -9,11 +9,7 @@ lib_LTLIBRARIES = libzfs_core.la
|
|||||||
USER_C = \
|
USER_C = \
|
||||||
libzfs_core.c
|
libzfs_core.c
|
||||||
|
|
||||||
KERNEL_C =
|
nodist_libzfs_core_la_SOURCES = $(USER_C)
|
||||||
|
|
||||||
nodist_libzfs_core_la_SOURCES = \
|
|
||||||
$(USER_C) \
|
|
||||||
$(KERNEL_C)
|
|
||||||
|
|
||||||
libzfs_core_la_LIBADD = \
|
libzfs_core_la_LIBADD = \
|
||||||
$(top_builddir)/lib/libnvpair/libnvpair.la
|
$(top_builddir)/lib/libnvpair/libnvpair.la
|
||||||
|
@ -5,7 +5,11 @@ VPATH = \
|
|||||||
$(top_srcdir)/module/zcommon \
|
$(top_srcdir)/module/zcommon \
|
||||||
$(top_srcdir)/lib/libzpool
|
$(top_srcdir)/lib/libzpool
|
||||||
|
|
||||||
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
|
# Suppress unused but set variable warnings often due to ASSERTs
|
||||||
|
AM_CFLAGS += $(NO_UNUSED_BUT_SET_VARIABLE)
|
||||||
|
|
||||||
|
# Includes kernel code generate warnings for large stack frames
|
||||||
|
AM_CFLAGS += $(FRAME_LARGER_THAN)
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
-I$(top_srcdir)/include \
|
-I$(top_srcdir)/include \
|
||||||
|
@ -1,18 +1,25 @@
|
|||||||
subdir-m += avl
|
subdir-m += avl
|
||||||
|
subdir-m += icp
|
||||||
subdir-m += nvpair
|
subdir-m += nvpair
|
||||||
subdir-m += unicode
|
subdir-m += unicode
|
||||||
subdir-m += zcommon
|
subdir-m += zcommon
|
||||||
subdir-m += zfs
|
subdir-m += zfs
|
||||||
subdir-m += icp
|
|
||||||
|
|
||||||
INSTALL_MOD_DIR ?= extra
|
INSTALL_MOD_DIR ?= extra
|
||||||
|
|
||||||
|
ZFS_MODULE_CFLAGS += -std=gnu99 -Wno-declaration-after-statement
|
||||||
|
ZFS_MODULE_CFLAGS += @KERNEL_DEBUG_CFLAGS@
|
||||||
ZFS_MODULE_CFLAGS += -include @SPL_OBJ@/spl_config.h
|
ZFS_MODULE_CFLAGS += -include @SPL_OBJ@/spl_config.h
|
||||||
ZFS_MODULE_CFLAGS += -include @abs_top_builddir@/zfs_config.h
|
ZFS_MODULE_CFLAGS += -include @abs_top_builddir@/zfs_config.h
|
||||||
ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include -I@SPL@/include -I@SPL@
|
ZFS_MODULE_CFLAGS += -I@abs_top_srcdir@/include -I@SPL@/include -I@SPL@
|
||||||
|
|
||||||
|
ZFS_MODULE_CPPFLAGS += -DHAVE_SPL -D_KERNEL
|
||||||
|
ZFS_MODULE_CPPFLAGS += @KERNEL_DEBUG_CPPFLAGS@
|
||||||
|
|
||||||
@CONFIG_QAT_TRUE@ZFS_MODULE_CFLAGS += -I@QAT_SRC@/include
|
@CONFIG_QAT_TRUE@ZFS_MODULE_CFLAGS += -I@QAT_SRC@/include
|
||||||
@CONFIG_QAT_TRUE@KBUILD_EXTRA_SYMBOLS += @QAT_SYMBOLS@
|
@CONFIG_QAT_TRUE@KBUILD_EXTRA_SYMBOLS += @QAT_SYMBOLS@
|
||||||
export ZFS_MODULE_CFLAGS
|
|
||||||
|
export ZFS_MODULE_CFLAGS ZFS_MODULE_CPPFLAGS
|
||||||
|
|
||||||
SUBDIR_TARGETS = icp
|
SUBDIR_TARGETS = icp
|
||||||
|
|
||||||
@ -35,12 +42,12 @@ modules:
|
|||||||
list='$(SUBDIR_TARGETS)'; for targetdir in $$list; do \
|
list='$(SUBDIR_TARGETS)'; for targetdir in $$list; do \
|
||||||
$(MAKE) -C $$targetdir; \
|
$(MAKE) -C $$targetdir; \
|
||||||
done
|
done
|
||||||
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ CONFIG_ZFS=m $@
|
$(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNEL_MAKE@ CONFIG_ZFS=m $@
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
@# Only cleanup the kernel build directories when CONFIG_KERNEL
|
@# Only cleanup the kernel build directories when CONFIG_KERNEL
|
||||||
@# is defined. This indicates that kernel modules should be built.
|
@# is defined. This indicates that kernel modules should be built.
|
||||||
@CONFIG_KERNEL_TRUE@ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNELMAKE_PARAMS@ $@
|
@CONFIG_KERNEL_TRUE@ $(MAKE) -C @LINUX_OBJ@ SUBDIRS=`pwd` @KERNEL_MAKE@ $@
|
||||||
|
|
||||||
if [ -f @SPL_SYMBOLS@ ]; then $(RM) @SPL_SYMBOLS@; fi
|
if [ -f @SPL_SYMBOLS@ ]; then $(RM) @SPL_SYMBOLS@; fi
|
||||||
if [ -f @LINUX_SYMBOLS@ ]; then $(RM) @LINUX_SYMBOLS@; fi
|
if [ -f @LINUX_SYMBOLS@ ]; then $(RM) @LINUX_SYMBOLS@; fi
|
||||||
|
@ -3,8 +3,8 @@ obj = @abs_builddir@
|
|||||||
|
|
||||||
MODULE := zavl
|
MODULE := zavl
|
||||||
|
|
||||||
EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
|
|
||||||
|
|
||||||
obj-$(CONFIG_ZFS) := $(MODULE).o
|
obj-$(CONFIG_ZFS) := $(MODULE).o
|
||||||
|
|
||||||
|
ccflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS)
|
||||||
|
|
||||||
$(MODULE)-objs += avl.o
|
$(MODULE)-objs += avl.o
|
||||||
|
@ -23,14 +23,11 @@ ifeq ($(TARGET_ASM_DIR), asm-generic)
|
|||||||
ASM_SOURCES :=
|
ASM_SOURCES :=
|
||||||
endif
|
endif
|
||||||
|
|
||||||
EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
|
|
||||||
EXTRA_AFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
|
|
||||||
|
|
||||||
obj-$(CONFIG_ZFS) := $(MODULE).o
|
obj-$(CONFIG_ZFS) := $(MODULE).o
|
||||||
|
|
||||||
ccflags-y += -I$(src)/include
|
asflags-y := -I$(src)/include
|
||||||
asflags-y += -I$(src)/include
|
ccflags-y := -I$(src)/include
|
||||||
asflags-y += $(ZFS_MODULE_CFLAGS)
|
ccflags-y += $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS)
|
||||||
|
|
||||||
$(MODULE)-objs += illumos-crypto.o
|
$(MODULE)-objs += illumos-crypto.o
|
||||||
$(MODULE)-objs += api/kcf_cipher.o
|
$(MODULE)-objs += api/kcf_cipher.o
|
||||||
|
@ -3,10 +3,10 @@ obj = @abs_builddir@
|
|||||||
|
|
||||||
MODULE := znvpair
|
MODULE := znvpair
|
||||||
|
|
||||||
EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
|
|
||||||
|
|
||||||
obj-$(CONFIG_ZFS) := $(MODULE).o
|
obj-$(CONFIG_ZFS) := $(MODULE).o
|
||||||
|
|
||||||
|
ccflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS)
|
||||||
|
|
||||||
$(MODULE)-objs += nvpair.o
|
$(MODULE)-objs += nvpair.o
|
||||||
$(MODULE)-objs += fnvpair.o
|
$(MODULE)-objs += fnvpair.o
|
||||||
$(MODULE)-objs += nvpair_alloc_spl.o
|
$(MODULE)-objs += nvpair_alloc_spl.o
|
||||||
|
@ -3,9 +3,9 @@ obj = @abs_builddir@
|
|||||||
|
|
||||||
MODULE := zunicode
|
MODULE := zunicode
|
||||||
|
|
||||||
EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
|
|
||||||
|
|
||||||
obj-$(CONFIG_ZFS) := $(MODULE).o
|
obj-$(CONFIG_ZFS) := $(MODULE).o
|
||||||
|
|
||||||
|
ccflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS)
|
||||||
|
|
||||||
$(MODULE)-objs += u8_textprep.o
|
$(MODULE)-objs += u8_textprep.o
|
||||||
$(MODULE)-objs += uconv.o
|
$(MODULE)-objs += uconv.o
|
||||||
|
@ -3,10 +3,10 @@ obj = @abs_builddir@
|
|||||||
|
|
||||||
MODULE := zcommon
|
MODULE := zcommon
|
||||||
|
|
||||||
EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
|
|
||||||
|
|
||||||
obj-$(CONFIG_ZFS) := $(MODULE).o
|
obj-$(CONFIG_ZFS) := $(MODULE).o
|
||||||
|
|
||||||
|
ccflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS)
|
||||||
|
|
||||||
$(MODULE)-objs += zfeature_common.o
|
$(MODULE)-objs += zfeature_common.o
|
||||||
$(MODULE)-objs += zfs_comutil.o
|
$(MODULE)-objs += zfs_comutil.o
|
||||||
$(MODULE)-objs += zfs_deleg.o
|
$(MODULE)-objs += zfs_deleg.o
|
||||||
|
@ -3,10 +3,13 @@ obj = @abs_builddir@
|
|||||||
|
|
||||||
MODULE := zfs
|
MODULE := zfs
|
||||||
|
|
||||||
EXTRA_CFLAGS = $(ZFS_MODULE_CFLAGS) @KERNELCPPFLAGS@
|
|
||||||
|
|
||||||
obj-$(CONFIG_ZFS) := $(MODULE).o
|
obj-$(CONFIG_ZFS) := $(MODULE).o
|
||||||
|
|
||||||
|
ccflags-y := $(ZFS_MODULE_CFLAGS) $(ZFS_MODULE_CPPFLAGS)
|
||||||
|
|
||||||
|
# Suppress unused but set variable warnings often due to ASSERTs
|
||||||
|
ccflags-y += $(NO_UNUSED_BUT_SET_VARIABLE)
|
||||||
|
|
||||||
$(MODULE)-objs += abd.o
|
$(MODULE)-objs += abd.o
|
||||||
$(MODULE)-objs += arc.o
|
$(MODULE)-objs += arc.o
|
||||||
$(MODULE)-objs += blkptr.o
|
$(MODULE)-objs += blkptr.o
|
||||||
|
@ -37,6 +37,7 @@
|
|||||||
#define buildforkernels akmod
|
#define buildforkernels akmod
|
||||||
|
|
||||||
%bcond_with debug
|
%bcond_with debug
|
||||||
|
%bcond_with debuginfo
|
||||||
|
|
||||||
|
|
||||||
Name: %{module}-kmod
|
Name: %{module}-kmod
|
||||||
@ -116,6 +117,12 @@ bash %{SOURCE10} --target %{_target_cpu} %{?repo:--repo %{?repo}} --kmodname %{
|
|||||||
%define debug --disable-debug
|
%define debug --disable-debug
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with debuginfo}
|
||||||
|
%define debuginfo --enable-debuginfo
|
||||||
|
%else
|
||||||
|
%define debuginfo --disable-debuginfo
|
||||||
|
%endif
|
||||||
|
|
||||||
#
|
#
|
||||||
# Allow the overriding of spl locations
|
# Allow the overriding of spl locations
|
||||||
#
|
#
|
||||||
@ -156,7 +163,8 @@ for kernel_version in %{?kernel_versions}; do
|
|||||||
--with-linux-obj=%{kobj} \
|
--with-linux-obj=%{kobj} \
|
||||||
--with-spl="%{spldir}" \
|
--with-spl="%{spldir}" \
|
||||||
--with-spl-obj="%{splobj}" \
|
--with-spl-obj="%{splobj}" \
|
||||||
%{debug}
|
%{debug} \
|
||||||
|
%{debuginfo}
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
cd ..
|
cd ..
|
||||||
done
|
done
|
||||||
|
@ -34,6 +34,8 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%bcond_with debug
|
%bcond_with debug
|
||||||
|
%bcond_with debuginfo
|
||||||
|
%bcond_with asan
|
||||||
%bcond_with systemd
|
%bcond_with systemd
|
||||||
|
|
||||||
# Generic enable switch for systemd
|
# Generic enable switch for systemd
|
||||||
@ -223,6 +225,19 @@ image which is ZFS aware.
|
|||||||
%else
|
%else
|
||||||
%define debug --disable-debug
|
%define debug --disable-debug
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with debuginfo}
|
||||||
|
%define debuginfo --enable-debuginfo
|
||||||
|
%else
|
||||||
|
%define debuginfo --disable-debuginfo
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%if %{with asan}
|
||||||
|
%define asan --enable-asan
|
||||||
|
%else
|
||||||
|
%define asan --disable-asan
|
||||||
|
%endif
|
||||||
|
|
||||||
%if 0%{?_systemd}
|
%if 0%{?_systemd}
|
||||||
%define systemd --enable-systemd --with-systemdunitdir=%{_unitdir} --with-systemdpresetdir=%{_presetdir} --disable-sysvinit
|
%define systemd --enable-systemd --with-systemdunitdir=%{_unitdir} --with-systemdpresetdir=%{_presetdir} --disable-sysvinit
|
||||||
%define systemd_svcs zfs-import-cache.service zfs-import-scan.service zfs-mount.service zfs-share.service zfs-zed.service zfs.target zfs-import.target
|
%define systemd_svcs zfs-import-cache.service zfs-import-scan.service zfs-mount.service zfs-share.service zfs-zed.service zfs.target zfs-import.target
|
||||||
@ -240,6 +255,8 @@ image which is ZFS aware.
|
|||||||
--with-dracutdir=%{_dracutdir} \
|
--with-dracutdir=%{_dracutdir} \
|
||||||
--disable-static \
|
--disable-static \
|
||||||
%{debug} \
|
%{debug} \
|
||||||
|
%{debuginfo} \
|
||||||
|
%{asan} \
|
||||||
%{systemd}
|
%{systemd}
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
%bcond_with debug
|
%bcond_with debug
|
||||||
|
%bcond_with debuginfo
|
||||||
|
|
||||||
Name: @PACKAGE@-kmod
|
Name: @PACKAGE@-kmod
|
||||||
Version: @VERSION@
|
Version: @VERSION@
|
||||||
@ -58,6 +59,12 @@ fi
|
|||||||
%define debug --disable-debug
|
%define debug --disable-debug
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{with debuginfo}
|
||||||
|
%define debuginfo --enable-debuginfo
|
||||||
|
%else
|
||||||
|
%define debuginfo --disable-debuginfo
|
||||||
|
%endif
|
||||||
|
|
||||||
%setup -n %{kmod_name}-%{version}
|
%setup -n %{kmod_name}-%{version}
|
||||||
%build
|
%build
|
||||||
%configure \
|
%configure \
|
||||||
@ -66,7 +73,8 @@ fi
|
|||||||
--with-linux-obj=%{kobj} \
|
--with-linux-obj=%{kobj} \
|
||||||
--with-spl="%{splsrc}" \
|
--with-spl="%{splsrc}" \
|
||||||
--with-spl-obj="%{splobj}" \
|
--with-spl-obj="%{splobj}" \
|
||||||
%{debug}
|
%{debug} \
|
||||||
|
%{debuginfo}
|
||||||
make %{?_smp_mflags}
|
make %{?_smp_mflags}
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
@ -30,6 +30,7 @@ fi
|
|||||||
|
|
||||||
# shellcheck disable=SC2034
|
# shellcheck disable=SC2034
|
||||||
PROG=zloop.sh
|
PROG=zloop.sh
|
||||||
|
GDB=${GDB:-gdb}
|
||||||
|
|
||||||
DEFAULTWORKDIR=/var/tmp
|
DEFAULTWORKDIR=/var/tmp
|
||||||
DEFAULTCOREDIR=/var/tmp/zloop
|
DEFAULTCOREDIR=/var/tmp/zloop
|
||||||
@ -182,6 +183,7 @@ shift $((OPTIND - 1))
|
|||||||
|
|
||||||
# enable core dumps
|
# enable core dumps
|
||||||
ulimit -c unlimited
|
ulimit -c unlimited
|
||||||
|
export ASAN_OPTIONS=abort_on_error=1:disable_coredump=0
|
||||||
|
|
||||||
if [[ -f "$(core_file)" ]]; then
|
if [[ -f "$(core_file)" ]]; then
|
||||||
echo -n "There's a core dump here you might want to look at first... "
|
echo -n "There's a core dump here you might want to look at first... "
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
AM_CPPFLAGS += -I$(top_srcdir)/include
|
AM_CPPFLAGS += -I$(top_srcdir)/include
|
||||||
LDADD = $(top_srcdir)/lib/libicp/libicp.la
|
LDADD = $(top_srcdir)/lib/libicp/libicp.la
|
||||||
|
|
||||||
|
@ -93,6 +93,7 @@ if is_linux; then
|
|||||||
ulimit -c unlimited
|
ulimit -c unlimited
|
||||||
echo "$corepath/core.zfs" >/proc/sys/kernel/core_pattern
|
echo "$corepath/core.zfs" >/proc/sys/kernel/core_pattern
|
||||||
echo 0 >/proc/sys/kernel/core_uses_pid
|
echo 0 >/proc/sys/kernel/core_uses_pid
|
||||||
|
export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0"
|
||||||
else
|
else
|
||||||
log_must coreadm -p ${corepath}/core.%f
|
log_must coreadm -p ${corepath}/core.%f
|
||||||
fi
|
fi
|
||||||
|
@ -89,6 +89,7 @@ if is_linux; then
|
|||||||
ulimit -c unlimited
|
ulimit -c unlimited
|
||||||
echo "$corepath/core.zpool" >/proc/sys/kernel/core_pattern
|
echo "$corepath/core.zpool" >/proc/sys/kernel/core_pattern
|
||||||
echo 0 >/proc/sys/kernel/core_uses_pid
|
echo 0 >/proc/sys/kernel/core_uses_pid
|
||||||
|
export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0"
|
||||||
else
|
else
|
||||||
coreadm -p ${corepath}/core.%f
|
coreadm -p ${corepath}/core.%f
|
||||||
fi
|
fi
|
||||||
|
@ -61,9 +61,10 @@ log_mustnot zpool freeze fakepool
|
|||||||
[[ -f core ]] && log_must rm -f core
|
[[ -f core ]] && log_must rm -f core
|
||||||
|
|
||||||
if is_linux; then
|
if is_linux; then
|
||||||
ulimit -c unlimited
|
ulimit -c unlimited
|
||||||
echo "core" >/proc/sys/kernel/core_pattern
|
echo "core" >/proc/sys/kernel/core_pattern
|
||||||
echo 0 >/proc/sys/kernel/core_uses_pid
|
echo 0 >/proc/sys/kernel/core_uses_pid
|
||||||
|
export ASAN_OPTIONS="abort_on_error=1:disable_coredump=0"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
ZFS_ABORT=1; export ZFS_ABORT
|
ZFS_ABORT=1; export ZFS_ABORT
|
||||||
|
@ -1,4 +1,5 @@
|
|||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
AM_CPPFLAGS += -I$(top_srcdir)/include
|
AM_CPPFLAGS += -I$(top_srcdir)/include
|
||||||
AM_CPPFLAGS += -I$(top_srcdir)/lib/libspl/include
|
AM_CPPFLAGS += -I$(top_srcdir)/lib/libspl/include
|
||||||
LDADD = $(top_srcdir)/lib/libicp/libicp.la
|
LDADD = $(top_srcdir)/lib/libicp/libicp.la
|
||||||
|
Loading…
Reference in New Issue
Block a user