diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-27 13:56:47 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-27 13:56:47 +0200 |
| commit | 077c63084488ac38c1c44e8cdaa9c33086f0a649 (patch) | |
| tree | c528abc8ae8570e66fecb123a9a1e821993f1f27 /memory/replace | |
| parent | be1786f7b0e692d8f4326dbf53e7d0689813ee2d (diff) | |
| download | UXP-077c63084488ac38c1c44e8cdaa9c33086f0a649.tar UXP-077c63084488ac38c1c44e8cdaa9c33086f0a649.tar.gz UXP-077c63084488ac38c1c44e8cdaa9c33086f0a649.tar.lz UXP-077c63084488ac38c1c44e8cdaa9c33086f0a649.tar.xz UXP-077c63084488ac38c1c44e8cdaa9c33086f0a649.zip | |
Remove support for making jemalloc4 the default memory allocator.
Diffstat (limited to 'memory/replace')
| -rw-r--r-- | memory/replace/logalloc/replay/Replay.cpp | 4 | ||||
| -rw-r--r-- | memory/replace/moz.build | 5 |
2 files changed, 4 insertions, 5 deletions
diff --git a/memory/replace/logalloc/replay/Replay.cpp b/memory/replace/logalloc/replay/Replay.cpp index 30fcd21e5..0ae20de2c 100644 --- a/memory/replace/logalloc/replay/Replay.cpp +++ b/memory/replace/logalloc/replay/Replay.cpp @@ -286,7 +286,7 @@ MOZ_BEGIN_EXTERN_C /* mozjemalloc relies on DllMain to initialize, but DllMain is not invoked * for executables, so manually invoke mozjemalloc initialization. */ -#if defined(_WIN32) && !defined(MOZ_JEMALLOC4) +#if defined(_WIN32) void malloc_init_hard(void); #endif @@ -475,7 +475,7 @@ main() FdReader reader(0); Replay replay; -#if defined(_WIN32) && !defined(MOZ_JEMALLOC4) +#if defined(_WIN32) malloc_init_hard(); #endif diff --git a/memory/replace/moz.build b/memory/replace/moz.build index 111b8456b..1f29da7aa 100644 --- a/memory/replace/moz.build +++ b/memory/replace/moz.build @@ -9,9 +9,8 @@ DIRS += [ 'replace', ] -# Build jemalloc3 as a replace-malloc lib when building with mozjemalloc -if not CONFIG['MOZ_JEMALLOC4']: - DIRS += ['jemalloc'] +# Build jemalloc4 as a replace-malloc lib when building with mozjemalloc +DIRS += ['jemalloc'] if CONFIG['MOZ_REPLACE_MALLOC_LINKAGE'] == 'dummy library': DIRS += ['dummy'] |