From 1a78ec8941a76d2486bf6dc00cfa591252bddc05 Mon Sep 17 00:00:00 2001
From: Jason Evans <jasone@FreeBSD.org>
Date: Fri, 30 Jun 2017 17:45:51 +0000
Subject: [PATCH] Default the abort_conf malloc option to false.

This avoids troublesome backward compatibility issues.
---
 contrib/jemalloc/FREEBSD-diffs                           | 9 +++++----
 contrib/jemalloc/FREEBSD-upgrade                         | 1 +
 contrib/jemalloc/doc/jemalloc.3                          | 9 +++++----
 .../include/jemalloc/internal/jemalloc_internal_defs.h   | 2 +-
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/contrib/jemalloc/FREEBSD-diffs b/contrib/jemalloc/FREEBSD-diffs
index 8786132d5c6a..115c92581350 100644
--- a/contrib/jemalloc/FREEBSD-diffs
+++ b/contrib/jemalloc/FREEBSD-diffs
@@ -1,8 +1,8 @@
 diff --git a/doc/jemalloc.xml.in b/doc/jemalloc.xml.in
-index 21e401ac..f977c5f5 100644
+index 21e401ac..c26f9f4a 100644
 --- a/doc/jemalloc.xml.in
 +++ b/doc/jemalloc.xml.in
-@@ -53,11 +53,21 @@
+@@ -53,11 +53,22 @@
      <para>This manual describes jemalloc @jemalloc_version@.  More information
      can be found at the <ulink
      url="http://jemalloc.net/">jemalloc website</ulink>.</para>
@@ -10,7 +10,8 @@ index 21e401ac..f977c5f5 100644
 +    <para>The following configuration options are enabled in libc's built-in
 +    jemalloc: <option>--enable-fill</option>,
 +    <option>--enable-lazy-lock</option>, <option>--enable-stats</option>,
-+    <option>--enable-utrace</option>, and <option>--enable-xmalloc</option>.
++    <option>--enable-utrace</option>, <option>--enable-xmalloc</option>, and
++    <option>--with-malloc-conf=abort_conf:false</option>.
 +    Additionally, <option>--enable-debug</option> is enabled in development
 +    versions of FreeBSD (controlled by the
 +    <constant>MALLOC_PRODUCTION</constant> make variable).</para>
@@ -25,7 +26,7 @@ index 21e401ac..f977c5f5 100644
        <refsect2>
          <title>Standard API</title>
          <funcprototype>
-@@ -3252,4 +3262,18 @@ malloc_conf = "narenas:1";]]></programlisting></para>
+@@ -3252,4 +3263,18 @@ malloc_conf = "narenas:1";]]></programlisting></para>
      <para>The <function>posix_memalign()</function> function conforms
      to IEEE Std 1003.1-2001 (<quote>POSIX.1</quote>).</para>
    </refsect1>
diff --git a/contrib/jemalloc/FREEBSD-upgrade b/contrib/jemalloc/FREEBSD-upgrade
index 2a4a0c9611d6..666790bdff13 100755
--- a/contrib/jemalloc/FREEBSD-upgrade
+++ b/contrib/jemalloc/FREEBSD-upgrade
@@ -96,6 +96,7 @@ do_extract_helper() {
 
 do_autogen() {
   ./autogen.sh --enable-xmalloc --enable-utrace \
+    --with-malloc-conf=abort_conf:false \
     --with-xslroot=/usr/local/share/xsl/docbook --with-private-namespace=__ \
     --with-lg-page-sizes=12,13,14,16
 }
diff --git a/contrib/jemalloc/doc/jemalloc.3 b/contrib/jemalloc/doc/jemalloc.3
index af3b5dfbe7d7..c5fd0c70e4e8 100644
--- a/contrib/jemalloc/doc/jemalloc.3
+++ b/contrib/jemalloc/doc/jemalloc.3
@@ -2,12 +2,12 @@
 .\"     Title: JEMALLOC
 .\"    Author: Jason Evans
 .\" Generator: DocBook XSL Stylesheets v1.76.1 <http://docbook.sf.net/>
-.\"      Date: 06/14/2017
+.\"      Date: 06/29/2017
 .\"    Manual: User Manual
 .\"    Source: jemalloc 5.0.0-4-g84f6c2cae0fb1399377ef6aea9368444c4987cc6
 .\"  Language: English
 .\"
-.TH "JEMALLOC" "3" "06/14/2017" "jemalloc 5.0.0-4-g84f6c2cae0fb" "User Manual"
+.TH "JEMALLOC" "3" "06/29/2017" "jemalloc 5.0.0-4-g84f6c2cae0fb" "User Manual"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -38,8 +38,9 @@ The following configuration options are enabled in libc\*(Aqs built\-in jemalloc
 \fB\-\-enable\-fill\fR,
 \fB\-\-enable\-lazy\-lock\fR,
 \fB\-\-enable\-stats\fR,
-\fB\-\-enable\-utrace\fR, and
-\fB\-\-enable\-xmalloc\fR\&. Additionally,
+\fB\-\-enable\-utrace\fR,
+\fB\-\-enable\-xmalloc\fR, and
+\fB\-\-with\-malloc\-conf=abort_conf:false\fR\&. Additionally,
 \fB\-\-enable\-debug\fR
 is enabled in development versions of FreeBSD (controlled by the
 \fBMALLOC_PRODUCTION\fR
diff --git a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
index 59ccdcb00e7a..8f6e266502d4 100644
--- a/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
+++ b/contrib/jemalloc/include/jemalloc/internal/jemalloc_internal_defs.h
@@ -329,7 +329,7 @@
 /* #undef JEMALLOC_EXPORT */
 
 /* config.malloc_conf options string. */
-#define JEMALLOC_CONFIG_MALLOC_CONF ""
+#define JEMALLOC_CONFIG_MALLOC_CONF "abort_conf:false"
 
 /* If defined, jemalloc takes the malloc/free/etc. symbol names. */
 #define JEMALLOC_IS_MALLOC 1