Author: dim
Date: Sun Sep 6 09:08:06 2020
New Revision: 365373
URL: https://svnweb.freebsd.org/changeset/base/365373
Log:
Follow-up r365371 by removing sentences which indicate the state of the
MK_MALLOC_PRODUCTION option on -CURRENT.
Also, for the sake of backwards compatibility, support the old way of
enabling 'production malloc', e.g. by adding a define in make.conf(5).
MFC after: 1 week
X-MFC-With: r365371
Modified:
head/lib/libc/stdlib/jemalloc/Makefile.inc
head/tools/build/options/WITHOUT_MALLOC_PRODUCTION
head/tools/build/options/WITH_MALLOC_PRODUCTION
Modified: head/lib/libc/stdlib/jemalloc/Makefile.inc
==============================================================================
--- head/lib/libc/stdlib/jemalloc/Makefile.inc Sun Sep 6 00:36:51 2020
(r365372)
+++ head/lib/libc/stdlib/jemalloc/Makefile.inc Sun Sep 6 09:08:06 2020
(r365373)
@@ -45,6 +45,6 @@ MLINKS+= \
jemalloc.3 nallocx.3 \
jemalloc.3 malloc.conf.5
-.if ${MK_MALLOC_PRODUCTION} != "no"
+.if ${MK_MALLOC_PRODUCTION} != "no" || defined(MALLOC_PRODUCTION)
CFLAGS+= -DMALLOC_PRODUCTION
.endif
Modified: head/tools/build/options/WITHOUT_MALLOC_PRODUCTION
==============================================================================
--- head/tools/build/options/WITHOUT_MALLOC_PRODUCTION Sun Sep 6 00:36:51
2020 (r365372)
+++ head/tools/build/options/WITHOUT_MALLOC_PRODUCTION Sun Sep 6 09:08:06
2020 (r365373)
@@ -2,4 +2,3 @@
Set to enable assertions and statistics gathering in
.Xr malloc 3 .
It also defaults the A and J runtime options to on.
-Enabled by default on -CURRENT.
Modified: head/tools/build/options/WITH_MALLOC_PRODUCTION
==============================================================================
--- head/tools/build/options/WITH_MALLOC_PRODUCTION Sun Sep 6 00:36:51
2020 (r365372)
+++ head/tools/build/options/WITH_MALLOC_PRODUCTION Sun Sep 6 09:08:06
2020 (r365373)
@@ -2,4 +2,3 @@
Set to disable assertions and statistics gathering in
.Xr malloc 3 .
It also defaults the A and J runtime options to off.
-Disabled by default on -CURRENT.
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
