Date: Sat, 12 Sep 2020 19:40:05 +0000 (UTC) From: Dimitry Andric <dim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r365671 - in stable: 11 11/share/man/man5 11/share/mk 12 12/share/man/man5 12/share/mk Message-ID: <202009121940.08CJe5GP088364@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dim Date: Sat Sep 12 19:40:04 2020 New Revision: 365671 URL: https://svnweb.freebsd.org/changeset/base/365671 Log: 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> Modified: stable/11/UPDATING stable/11/share/man/man5/src.conf.5 stable/11/share/mk/src.opts.mk Changes in other areas also in this revision: Modified: stable/12/UPDATING stable/12/share/man/man5/src.conf.5 stable/12/share/mk/src.opts.mk Modified: stable/11/UPDATING ============================================================================== --- stable/11/UPDATING Sat Sep 12 19:33:25 2020 (r365670) +++ stable/11/UPDATING Sat Sep 12 19:40:04 2020 (r365671) @@ -16,6 +16,18 @@ from older versions of FreeBSD, try WITHOUT_CLANG and 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 Modified: stable/11/share/man/man5/src.conf.5 ============================================================================== --- stable/11/share/man/man5/src.conf.5 Sat Sep 12 19:33:25 2020 (r365670) +++ stable/11/share/man/man5/src.conf.5 Sat Sep 12 19:40:04 2020 (r365671) @@ -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: Modified: stable/11/share/mk/src.opts.mk ============================================================================== --- stable/11/share/mk/src.opts.mk Sat Sep 12 19:33:25 2020 (r365670) +++ stable/11/share/mk/src.opts.mk Sat Sep 12 19:40:04 2020 (r365671) @@ -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 \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009121940.08CJe5GP088364>