Backed out changeset a67867200ec3 (bug 1142403) for Linuxx64 M-e10s(2) bustage.
authorNigel Babu <nigelbabu@gmail.com>
Tue, 08 Sep 2015 13:14:05 +0530
changeset 293892 e2021f179191b8352529d612238146655d8e8586
parent 293891 75eb5a9cbff7c374fa9900cad75ea873943b2fbe
child 293893 c96fdda7972792eae00d16eee1a156304654f5e1
push id5245
push userraliiev@mozilla.com
push dateThu, 29 Oct 2015 11:30:51 +0000
treeherdermozilla-beta@dac831dc1bd0 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1142403
milestone43.0a1
backs outa67867200ec31a040bb6bf8320bde20beb34aa3e
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
Backed out changeset a67867200ec3 (bug 1142403) for Linuxx64 M-e10s(2) bustage.
memory/jemalloc/moz.build
--- a/memory/jemalloc/moz.build
+++ b/memory/jemalloc/moz.build
@@ -1,22 +1,15 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# When built with --enable-debug, jemalloc3 makes headers define functions that
-# are normally inlined, and that prevents unified sources from working.
-if CONFIG['MOZ_DEBUG']:
-    maybe_unified_sources = SOURCES
-else:
-    maybe_unified_sources = UNIFIED_SOURCES
-
-maybe_unified_sources += [
+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',
@@ -41,17 +34,17 @@ maybe_unified_sources += [
 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 += [
+    UNIFIED_SOURCES += [
         'src/src/zone.c',
     ]
 
 Library('jemalloc')
 
 FORCE_STATIC_LIB = True
 
 if CONFIG['MOZ_GLUE_IN_PROGRAM']: