From 0dceabda7f1049fd70d38cf61c80dd5148fdca4e Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Sat, 17 Aug 2013 19:46:52 -0400
Subject: [PATCH 1/4] Revert "Turn off jemalloc"

This reverts commit 371a316ec93a977f9dcd305b5f532cd394fa6885.

Closes #7217
---
 mk/rt.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mk/rt.mk b/mk/rt.mk
index 0aeeec3b487e8..75701a031845c 100644
--- a/mk/rt.mk
+++ b/mk/rt.mk
@@ -149,10 +149,10 @@ rt/$(1)/stage$(2)/arch/$$(HOST_$(1))/libmorestack.a: $$(MORESTACK_OBJ_$(1)_$(2))
 	$$(Q)$(AR_$(1)) rcs $$@ $$<
 
 rt/$(1)/stage$(2)/$(CFG_RUNTIME_$(1)): $$(RUNTIME_OBJS_$(1)_$(2)) $$(MKFILE_DEPS) \
-                        $$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1)_$(2))
+                        $$(RUNTIME_DEF_$(1)_$(2)) $$(LIBUV_LIB_$(1)_$(2)) $$(JEMALLOC_LIB_$(1)_$(2))
 	@$$(call E, link: $$@)
 	$$(Q)$$(call CFG_LINK_CXX_$(1),$$@, $$(RUNTIME_OBJS_$(1)_$(2)) \
-	  $$(CFG_GCCISH_POST_LIB_FLAGS_$(1)) $$(LIBUV_LIB_$(1)_$(2)) \
+	  $$(JEMALLOC_LIB_$(1)_$(2)) $$(CFG_GCCISH_POST_LIB_FLAGS_$(1)) $$(LIBUV_LIB_$(1)_$(2)) \
 	  $$(CFG_LIBUV_LINK_FLAGS_$(1)),$$(RUNTIME_DEF_$(1)_$(2)),$$(CFG_RUNTIME_$(1)))
 
 # FIXME: For some reason libuv's makefiles can't figure out the

From 2c7164595fd01f4a14763ed377aece1130de90c0 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Mon, 19 Aug 2013 16:09:46 -0700
Subject: [PATCH 2/4] rt: make jemalloc header conform to android signature.

---
 src/rt/jemalloc/configure.ac | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/rt/jemalloc/configure.ac b/src/rt/jemalloc/configure.ac
index 882d3b3f3b02a..b4c49655533bb 100644
--- a/src/rt/jemalloc/configure.ac
+++ b/src/rt/jemalloc/configure.ac
@@ -257,6 +257,15 @@ case "${host}" in
 	AC_DEFINE([JEMALLOC_PURGE_MADVISE_FREE], [ ])
 	force_lazy_lock="1"
 	;;
+  *-*-linux-android*)
+	CFLAGS="$CFLAGS"
+	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+	abi="elf"
+	AC_DEFINE([JEMALLOC_HAS_ALLOCA_H])
+	AC_DEFINE([JEMALLOC_PURGE_MADVISE_DONTNEED], [ ])
+	AC_DEFINE([JEMALLOC_THREADED_INIT], [ ])
+	default_munmap="0"
+	;;
   *-*-linux*)
 	CFLAGS="$CFLAGS"
 	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"

From 517e6112710a8b0d107a847c862c3114d67d4b7a Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Mon, 19 Aug 2013 17:43:47 -0700
Subject: [PATCH 3/4] regenerate configure

---
 src/rt/jemalloc/configure | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/rt/jemalloc/configure b/src/rt/jemalloc/configure
index 428ac770a2298..f6ea76c7e8403 100755
--- a/src/rt/jemalloc/configure
+++ b/src/rt/jemalloc/configure
@@ -4453,7 +4453,7 @@ PIC_CFLAGS='-fPIC -DPIC'
 CTARGET='-o $@'
 LDTARGET='-o $@'
 EXTRA_LDFLAGS=
-MKLIB='$(AR) crus $@'
+MKLIB='ar crus $@'
 CC_MM=1
 
 default_munmap="1"
@@ -4479,6 +4479,18 @@ case "${host}" in
 
 	force_lazy_lock="1"
 	;;
+  *-*-linux-android*)
+	CFLAGS="$CFLAGS"
+	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
+	abi="elf"
+	$as_echo "#define JEMALLOC_HAS_ALLOCA_H 1" >>confdefs.h
+
+	$as_echo "#define JEMALLOC_PURGE_MADVISE_DONTNEED  " >>confdefs.h
+
+	$as_echo "#define JEMALLOC_THREADED_INIT  " >>confdefs.h
+
+	default_munmap="0"
+	;;
   *-*-linux*)
 	CFLAGS="$CFLAGS"
 	CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"

From ef436637ea02591c41b4898708f63bdf6e3f993c Mon Sep 17 00:00:00 2001
From: Daniel Micay <danielmicay@gmail.com>
Date: Mon, 19 Aug 2013 20:52:28 -0400
Subject: [PATCH 4/4] jemalloc: use $(AR), not `ar`

---
 src/rt/jemalloc/configure    | 2 +-
 src/rt/jemalloc/configure.ac | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/rt/jemalloc/configure b/src/rt/jemalloc/configure
index f6ea76c7e8403..47af18916a6cf 100755
--- a/src/rt/jemalloc/configure
+++ b/src/rt/jemalloc/configure
@@ -4453,7 +4453,7 @@ PIC_CFLAGS='-fPIC -DPIC'
 CTARGET='-o $@'
 LDTARGET='-o $@'
 EXTRA_LDFLAGS=
-MKLIB='ar crus $@'
+MKLIB='$(AR) crus $@'
 CC_MM=1
 
 default_munmap="1"
diff --git a/src/rt/jemalloc/configure.ac b/src/rt/jemalloc/configure.ac
index b4c49655533bb..2a53c14fda123 100644
--- a/src/rt/jemalloc/configure.ac
+++ b/src/rt/jemalloc/configure.ac
@@ -226,7 +226,7 @@ PIC_CFLAGS='-fPIC -DPIC'
 CTARGET='-o $@'
 LDTARGET='-o $@'
 EXTRA_LDFLAGS=
-MKLIB='ar crus $@'
+MKLIB='$(AR) crus $@'
 CC_MM=1
 
 dnl Platform-specific settings.  abi and RPATH can probably be determined