git: 1c9891b8df63 - stable/13 - jemalloc: restore JEMALLOC_DEBUG when building WITHOUT_MALLOC_PRODUCTION

[Kyle Evans]

The branch stable/13 has been updated by kevans:

URL: https://cgit.FreeBSD.org/src/commit/?id=1c9891b8df63f146bd9515e11f45384bc40d0ef4

commit 1c9891b8df63f146bd9515e11f45384bc40d0ef4
Author:     Kyle Evans <kevans at FreeBSD.org>
AuthorDate: 2021-01-22 23:13:42 +0000
Commit:     Kyle Evans <kevans at FreeBSD.org>
CommitDate: 2021-01-22 23:13:42 +0000

    jemalloc: restore JEMALLOC_DEBUG when building WITHOUT_MALLOC_PRODUCTION
    
    The default for MALLOC_PRODUCTION was switched to ON in 02611ef8ee9f.  This
    effectively reverts the jemalloc header change from bfd15705156b so that
    the knob behaves exactly as it does on a -CURRENT; that is, we are
    effectively doing:
    
    WITH_MALLOC_PRODUCTION -> -DMALLOC_PRODUCTION (default for stable/* and on)
    WITHOUT_MALLOC_PRODUCTION -> -DJEMALLOC_DEBUG (default for main)
    
    This allows the knob to be used for debugging on stable branches, too, which
    is believed to be the main reason one would want to twist it off.
    
    (direct commit)
---
 contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
index dfda508ea1e1..6ff0ce18d5da 100644
--- a/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
+++ b/contrib/jemalloc/include/jemalloc/jemalloc_FreeBSD.h
@@ -5,7 +5,7 @@
 #undef JEMALLOC_OVERRIDE_VALLOC
 
 #ifndef MALLOC_PRODUCTION
-#define	MALLOC_PRODUCTION
+#define	JEMALLOC_DEBUG
 #endif
 
 #undef JEMALLOC_DSS