Backed out changeset c3d41ab0a2df (bug 940218) for causing bug 941616
authorEhsan Akhgari <ehsan@mozilla.com>
Thu, 21 Nov 2013 14:28:52 -0500
changeset 156908 f7e67f38813418daeef5d69bc9d24c74380fe179
parent 156907 f5120348a27f02067b4ea070bc429fe5377686f6
child 156909 2bf7298530bdbc32c884a8d5950e4b2f0dd2c824
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
bugs940218, 941616
milestone28.0a1
backs outc3d41ab0a2dfe2d2e3ec22dfcbdbc178ffce6682
Backed out changeset c3d41ab0a2df (bug 940218) for causing bug 941616
memory/build/moz.build
memory/jemalloc/moz.build
memory/mozalloc/moz.build
--- a/memory/build/moz.build
+++ b/memory/build/moz.build
@@ -9,28 +9,28 @@ EXPORTS += [
     'mozmemory_wrap.h',
 ]
 
 if CONFIG['MOZ_REPLACE_MALLOC']:
     EXPORTS += [
         'malloc_decls.h',
         'replace_malloc.h',
     ]
-UNIFIED_SOURCES += [
+SOURCES += [
     'jemalloc_config.c',
     'mozmemory_wrap.c',
 ]
 
 if CONFIG['MOZ_JEMALLOC3']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'mozjemalloc_compat.c',
     ]
 
 if CONFIG['MOZ_REPLACE_MALLOC']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'replace_malloc.c',
     ]
 
 LIBRARY_NAME = 'memory'
 
 # Keep jemalloc separated when mozglue is statically linked
 if CONFIG['MOZ_MEMORY'] and (CONFIG['OS_TARGET'] in ('WINNT', 'Darwin', 'Android') or
                              CONFIG['MOZ_NATIVE_JEMALLOC']):
--- a/memory/jemalloc/moz.build
+++ b/memory/jemalloc/moz.build
@@ -1,29 +1,24 @@
 # -*- 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/.
 
-# These cannot be built unified because they both define static arena_purge
-# functions with different types.
 SOURCES += [
     'src/src/arena.c',
-    'src/src/ctl.c',
-]
-
-UNIFIED_SOURCES += [
     '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/prof.c',
     'src/src/quarantine.c',
@@ -32,15 +27,15 @@ UNIFIED_SOURCES += [
     'src/src/tcache.c',
     'src/src/tsd.c',
     'src/src/util.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']:
-    UNIFIED_SOURCES += [
+    SOURCES += [
         'src/src/zone.c',
     ]
 
 LIBRARY_NAME = 'jemalloc'
 
 FORCE_STATIC_LIB = True
--- a/memory/mozalloc/moz.build
+++ b/memory/mozalloc/moz.build
@@ -27,17 +27,17 @@ if CONFIG['WRAP_STL_INCLUDES']:
                 'msvc_throw_wrapper.h',
                 'throw_msvc.h',
             ]
             SOURCES += [
                 'msvc_raise_wrappers.cpp',
                 'msvc_throw_wrapper.cpp',
             ]
 
-UNIFIED_SOURCES += [
+SOURCES += [
     'mozalloc.cpp',
     'mozalloc_abort.cpp',
     'mozalloc_oom.cpp',
 ]
 
 LIBRARY_NAME = 'mozalloc'
 
 if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gonk':