Merge commit 'refs/top-bases/linux-topology' into linux-topology
This commit is contained in:
commit
27b293a274
|
@ -1,6 +1,6 @@
|
||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
AM_CFLAGS += $(FRAME_LARGER_THAN)
|
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
|
||||||
|
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
-I${top_srcdir}/lib/libspl/include \
|
-I${top_srcdir}/lib/libspl/include \
|
||||||
|
|
|
@ -18,15 +18,18 @@ AC_DEFUN([ZFS_AC_DEBUG], [
|
||||||
[
|
[
|
||||||
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror"
|
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG -Werror"
|
||||||
HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror"
|
HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG -Werror"
|
||||||
DEBUG_CFLAGS="-DDEBUG -Werror -fstack-check"
|
DEBUG_CFLAGS="-DDEBUG -Werror"
|
||||||
|
DEBUG_STACKFLAGS="-fstack-check"
|
||||||
],
|
],
|
||||||
[
|
[
|
||||||
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
|
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
|
||||||
HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
|
HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
|
||||||
DEBUG_CFLAGS="-DNDEBUG"
|
DEBUG_CFLAGS="-DNDEBUG"
|
||||||
|
DEBUG_STACKFLAGS=""
|
||||||
])
|
])
|
||||||
|
|
||||||
AC_SUBST(DEBUG_CFLAGS)
|
AC_SUBST(DEBUG_CFLAGS)
|
||||||
|
AC_SUBST(DEBUG_STACKFLAGS)
|
||||||
AC_MSG_RESULT([$enable_debug])
|
AC_MSG_RESULT([$enable_debug])
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
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}/module/avl/include \
|
-I${top_srcdir}/module/avl/include \
|
||||||
-I${top_srcdir}/lib/libspl/include
|
-I${top_srcdir}/lib/libspl/include
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
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}/lib/libefi/include \
|
-I${top_srcdir}/lib/libefi/include \
|
||||||
-I${top_srcdir}/lib/libspl/include
|
-I${top_srcdir}/lib/libspl/include
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
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}/module/nvpair/include \
|
-I${top_srcdir}/module/nvpair/include \
|
||||||
-I${top_srcdir}/lib/libnvpair/include \
|
-I${top_srcdir}/lib/libnvpair/include \
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
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}/module/unicode/include \
|
-I${top_srcdir}/module/unicode/include \
|
||||||
-I${top_srcdir}/lib/libspl/include
|
-I${top_srcdir}/lib/libspl/include
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
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}/lib/libuutil/include \
|
-I${top_srcdir}/lib/libuutil/include \
|
||||||
-I${top_srcdir}/lib/libspl/include \
|
-I${top_srcdir}/lib/libspl/include \
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
include $(top_srcdir)/config/Rules.am
|
include $(top_srcdir)/config/Rules.am
|
||||||
|
|
||||||
AM_CFLAGS += $(FRAME_LARGER_THAN)
|
AM_CFLAGS += $(DEBUG_STACKFLAGS) $(FRAME_LARGER_THAN)
|
||||||
|
|
||||||
SUBDIRS = include
|
SUBDIRS = include
|
||||||
DEFAULT_INCLUDES += \
|
DEFAULT_INCLUDES += \
|
||||||
|
|
Loading…
Reference in New Issue