Bug 772423 - Hook mozjemalloc's abort(). r=jlebar

memory/build/extraMallocFuncs.c

@@ -106,11 +106,10 @@ _je_malloc_message(void *cbopaque, const char *s)
 
 void (*je_malloc_message)(void *, const char *s) = _je_malloc_message;
 #endif
+#endif /* MOZ_JEMALLOC */
 
 #include <mozilla/Assertions.h>
 
 void moz_abort() {
   MOZ_CRASH();
 }
-
-#endif /* MOZ_JEMALLOC */

memory/mozjemalloc/Makefile.in

@@ -44,4 +44,6 @@ ifeq (,$(filter release esr,$(MOZ_UPDATE_CHANNEL)))
 DEFINES	+= -DMOZ_JEMALLOC_HARD_ASSERTS -DMOZ_TEMP_INVESTIGATION
 endif
 
+DEFINES += -Dabort=moz_abort
+
 include $(topsrcdir)/config/rules.mk