From 75422b539bb10d60ab0932ed9d7b5bd47f894ddf Mon Sep 17 00:00:00 2001
From: Dimitry Andric <dim@FreeBSD.org>
Date: Sat, 12 Sep 2020 19:40:04 +0000
Subject: [PATCH] Follow-up r365662 (MFC of r365371 and r365373) by correctly
 setting WITH_MALLOC_PRODUCTION for stable branches. Also add a note to
 UPDATING, to inform users about the new setting.

Direct commit to stable/{11,12} as this does not apply to head.

Noticed by:	imp, Ronald Klop <ronald-lists@klop.ws>
---
 UPDATING                  | 12 ++++++++++++
 share/man/man5/src.conf.5 |  6 +++---
 share/mk/src.opts.mk      |  2 +-
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/UPDATING b/UPDATING
index 4f3b83e6f965..2c75087991de 100644
--- a/UPDATING
+++ b/UPDATING
@@ -16,6 +16,18 @@ from older versions of FreeBSD, try WITHOUT_CLANG and WITH_GCC to bootstrap to
 the tip of head, and then rebuild without this option. The bootstrap process
 from older version of current across the gcc/clang cutover is a bit fragile.
 
+20200912:
+	The make.conf(5) MALLOC_PRODUCTION variable, used for disabling and
+	enabling assertions and statistics gathering in malloc(3), has been
+	migrated to a src.conf(5) WITH/WITHOUT_MALLOC_PRODUCTION option.
+
+	On stable branches, WITH_MALLOC_PRODUCTION is set by default, which
+	means that malloc(3) has assertions and statistics gathering disabled,
+	for improved performance.
+
+	For backwards compatibility, the make.conf(5) MALLOC_PRODUCTION is still
+	honored, but it is now deprecated and undocumented.
+
 20200723:
 	Clang, llvm, lld, lldb, compiler-rt, libc++, libunwind and openmp have
 	been upgraded to 10.0.1.  Please see the 20141231 entry below for
diff --git a/share/man/man5/src.conf.5 b/share/man/man5/src.conf.5
index 6410fbf85227..dfa98dfbf526 100644
--- a/share/man/man5/src.conf.5
+++ b/share/man/man5/src.conf.5
@@ -1183,10 +1183,10 @@ MTA selector.
 Set to not install
 .Xr make 1
 and related support files.
-.It Va WITH_MALLOC_PRODUCTION
-Set to disable assertions and statistics gathering in
+.It Va WITHOUT_MALLOC_PRODUCTION
+Set to enable assertions and statistics gathering in
 .Xr malloc 3 .
-It also defaults the A and J runtime options to off.
+It also defaults the A and J runtime options to on.
 .It Va WITHOUT_MAN
 Set to not build manual pages.
 When set, these options are also in effect:
diff --git a/share/mk/src.opts.mk b/share/mk/src.opts.mk
index 48bc368d2395..904ed6ea78fd 100644
--- a/share/mk/src.opts.mk
+++ b/share/mk/src.opts.mk
@@ -139,6 +139,7 @@ __DEFAULT_YES_OPTIONS = \
     MAIL \
     MAILWRAPPER \
     MAKE \
+    MALLOC_PRODUCTION \
     MANDOCDB \
     NDIS \
     NETCAT \
@@ -203,7 +204,6 @@ __DEFAULT_NO_OPTIONS = \
     LOADER_FORCE_LE \
     LOADER_VERBOSE \
     NAND \
-    MALLOC_PRODUCTION \
     OFED_EXTRA \
     OPENLDAP \
     REPRODUCIBLE_BUILD \