Bug 1142403 - Part 3: jemalloc4 no longer requires ctl.c to be built in non-unified mode in debug builds. r=glandium
authorChris Peterson <cpeterson@mozilla.com>
Thu, 22 Dec 2016 18:54:59 -0800
changeset 327117 5b315b98f03a04faa01e9de9132a1b2e4b70b414
parent 327116 e35cf42e5c92033b6d3d11c9b43061c4c8a0b605
child 327118 66465b966647794ea87387babf30b2607519a569
push id31119
push userkwierso@gmail.com
push dateFri, 23 Dec 2016 22:34:59 +0000
treeherdermozilla-central@da22155a2dc3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1142403
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1142403 - Part 3: jemalloc4 no longer requires ctl.c to be built in non-unified mode in debug builds. r=glandium
memory/jemalloc/moz.build
--- a/memory/jemalloc/moz.build
+++ b/memory/jemalloc/moz.build
@@ -15,16 +15,17 @@ maybe_unified_sources += [
     'src/src/arena.c',
     'src/src/atomic.c',
     'src/src/base.c',
     'src/src/bitmap.c',
     'src/src/chunk.c',
     'src/src/chunk_dss.c',
     'src/src/chunk_mmap.c',
     'src/src/ckh.c',
+    'src/src/ctl.c',
     'src/src/extent.c',
     'src/src/hash.c',
     'src/src/huge.c',
     'src/src/jemalloc.c',
     'src/src/mb.c',
     'src/src/mutex.c',
     'src/src/nstime.c',
     'src/src/pages.c',
@@ -36,21 +37,16 @@ maybe_unified_sources += [
     'src/src/stats.c',
     'src/src/tcache.c',
     'src/src/ticker.c',
     'src/src/tsd.c',
     'src/src/util.c',
     'src/src/witness.c',
 ]
 
-SOURCES += [
-    # This file cannot be built in unified mode because of symbol clash on arena_purge.
-    'src/src/ctl.c',
-]
-
 # Only OSX needs the zone allocation implementation,
 # but only if replace-malloc is not enabled.
 if CONFIG['OS_TARGET'] == 'Darwin' and not CONFIG['MOZ_REPLACE_MALLOC']:
     maybe_unified_sources += [
         'src/src/zone.c',
     ]
 
 if CONFIG['MOZ_JEMALLOC4']: