diff options
Diffstat (limited to 'memory/build/replace_malloc.c')
-rw-r--r-- | memory/build/replace_malloc.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/memory/build/replace_malloc.c b/memory/build/replace_malloc.c index 88dfde33c..f4c7eb878 100644 --- a/memory/build/replace_malloc.c +++ b/memory/build/replace_malloc.c @@ -10,10 +10,6 @@ # error Should not compile this file when replace-malloc is disabled #endif -#ifdef MOZ_SYSTEM_JEMALLOC -# error Should not compile this file when we want to use native jemalloc -#endif - #include "mozmemory_wrap.h" /* Declare all je_* functions */ @@ -513,6 +509,12 @@ register_zone(void) */ malloc_zone_t *purgeable_zone = malloc_default_purgeable_zone(); + // There is a problem related to the above with the system nano zone, which + // is hard to work around from here, and that is instead worked around by + // disabling the nano zone through an environment variable + // (MallocNanoZone=0). In Firefox, we do that through + // browser/app/macbuild/Contents/Info.plist.in. + /* Register the custom zone. At this point it won't be the default. */ malloc_zone_register(&zone); |