Ensure -NDEBUG does not get added to spl_config.h and is only set in the build option...

diff --git a/config/spl-build.m4 b/config/spl-build.m4
index c5c03197725f2585d8f14b53a58db2adbe8a85e9..9931330651cd99bcbc367e3a828f5249e6ab425b 100644 (file)
--- a/config/spl-build.m4
+++ b/config/spl-build.m4
@@ -97,8 +97,6 @@ AC_DEFUN([SPL_AC_DEBUG], [
                KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG"
        else
                AC_MSG_RESULT([no])
-               AC_DEFINE([NDEBUG], [1],
-               [Define to 1 to disable debug tracing])
                KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG"
        fi
 ])

diff --git a/configure b/configure
index 2ecf422f03c7ee157546bd3e7ef072e5c2851e83..5ac16ce74223576bd712568974d504cb894051e6 100755 (executable)
--- a/configure
+++ b/configure
@@ -19046,11 +19046,6 @@ echo "${ECHO_T}yes" >&6
        else
                echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6
-
-cat >>confdefs.h <<\_ACEOF
-#define NDEBUG 1
-_ACEOF
-
                KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG"
        fi
 

diff --git a/module/spl/spl-debug.c b/module/spl/spl-debug.c
index df22cbc487b478a80e5e4a1a45f600dac520fd72..d2b96b0c346c442a4ca0a22ddde16bccdddf9c88 100644 (file)
--- a/module/spl/spl-debug.c
+++ b/module/spl/spl-debug.c
@@ -1118,10 +1118,8 @@ void spl_debug_bug(char *file, const char *func, const int line, int flags)
          if (spl_debug_panic_on_bug)
                 spl_panic_in_progress = 1;
 
-#ifdef DEBUG
         spl_debug_dumpstack(NULL);
         spl_debug_dumplog(flags);
-#endif
 
         if (spl_debug_panic_on_bug)
                 panic("SBUG");

diff --git a/spl_config.h.in b/spl_config.h.in
index dfca13d099f7e466fd2c1f05a180760588bae0be..c19555a06a08d300b6ea75e61c348383d0f26b64 100644 (file)
--- a/spl_config.h.in
+++ b/spl_config.h.in
@@ -108,9 +108,6 @@
 /* Define to 1 if you have the <unistd.h> header file. */
 #undef HAVE_UNISTD_H
 
-/* Define to 1 to disable debug tracing */
-#undef NDEBUG
-
 /* Name of package */
 #undef PACKAGE