From c0476ca7677f104bf9d49ee8f824d2832ada3c9e Mon Sep 17 00:00:00 2001
From: Alan Jeffrey <ajeffrey@mozilla.com>
Date: Tue, 3 Nov 2015 10:47:43 -0600
Subject: [PATCH] Enabled jemalloc.

The --disable-jemalloc flag in makefile.cargo is replaced by --enable-jemalloc.

The memory library is loaded (as discussed in https://bugzilla.mozilla.org/show_bug.cgi?id=1134039).

This speeds up SM performance significantly (about 2x on some Dromaeo JS tests).
---
 makefile.cargo         | 2 +-
 mozjs/js/src/moz.build | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/makefile.cargo b/makefile.cargo
index 64524a1a10..bcba4e7337 100644
--- a/makefile.cargo
+++ b/makefile.cargo
@@ -1,4 +1,4 @@
-CONFIGURE_FLAGS := --disable-jemalloc
+CONFIGURE_FLAGS := --enable-jemalloc
 
 ifneq ($(HOST),$(TARGET))
 
diff --git a/mozjs/js/src/moz.build b/mozjs/js/src/moz.build
index 85f01785f9..352d42db36 100644
--- a/mozjs/js/src/moz.build
+++ b/mozjs/js/src/moz.build
@@ -502,6 +502,12 @@ if CONFIG['ENABLE_INTL_API']:
         'icu',
     ]
 
+# https://bugzilla.mozilla.org/show_bug.cgi?id=1134039
+if CONFIG['MOZ_MEMORY']:
+    USE_LIBS += [
+        'memory',
+    ]
+
 USE_LIBS += [
     'nspr',
     'zlib',