diff options
| author | wolfbeast <mcwerewolf@gmail.com> | 2018-04-27 19:16:45 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@gmail.com> | 2018-04-27 19:16:45 +0200 |
| commit | 43034a36e132ac4394e26cbfb4d855bd6f5114b3 (patch) | |
| tree | aee5502c6b17283b80ff2bf0706f97622df5d355 /memory/replace | |
| parent | 077c63084488ac38c1c44e8cdaa9c33086f0a649 (diff) | |
| download | uxp-43034a36e132ac4394e26cbfb4d855bd6f5114b3.tar.gz | |
Remove jemalloc 4 from our tree.
Diffstat (limited to 'memory/replace')
| -rw-r--r-- | memory/replace/jemalloc/moz.build | 31 | ||||
| -rw-r--r-- | memory/replace/jemalloc/pthread_atfork.c | 10 | ||||
| -rw-r--r-- | memory/replace/moz.build | 3 |
3 files changed, 0 insertions, 44 deletions
diff --git a/memory/replace/jemalloc/moz.build b/memory/replace/jemalloc/moz.build deleted file mode 100644 index 5e907af55c..0000000000 --- a/memory/replace/jemalloc/moz.build +++ /dev/null @@ -1,31 +0,0 @@ -# -*- Mode: python; 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/. - -SOURCES += [ - '../../build/jemalloc_config.cpp', - '../../build/mozjemalloc_compat.c', -] - -# Android doesn't have pthread_atfork, so just implement a dummy function. -# It shouldn't make much problem, as the use of fork is pretty limited on -# Android. -if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'android': - SOURCES += [ - 'pthread_atfork.c', - ] - -SharedLibrary('replace_jemalloc') - -DEFINES['MOZ_JEMALLOC4'] = True -DEFINES['MOZ_REPLACE_JEMALLOC'] = True - -LOCAL_INCLUDES += ['!../../jemalloc/src/include'] -if CONFIG['_MSC_VER']: - LOCAL_INCLUDES += ['/memory/jemalloc/src/include/msvc_compat'] - if not CONFIG['HAVE_INTTYPES_H']: - LOCAL_INCLUDES += ['/memory/jemalloc/src/include/msvc_compat/C99'] - -DISABLE_STL_WRAPPING = True diff --git a/memory/replace/jemalloc/pthread_atfork.c b/memory/replace/jemalloc/pthread_atfork.c deleted file mode 100644 index 6e737f0729..0000000000 --- a/memory/replace/jemalloc/pthread_atfork.c +++ /dev/null @@ -1,10 +0,0 @@ -/* 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/. */ - -int pthread_atfork(void (*prefork)(void), - void (*postfork_parent)(void), - void (*postfork_child)(void)) -{ - return 0; -} diff --git a/memory/replace/moz.build b/memory/replace/moz.build index 1f29da7aa3..e850637cbb 100644 --- a/memory/replace/moz.build +++ b/memory/replace/moz.build @@ -9,9 +9,6 @@ DIRS += [ 'replace', ] -# Build jemalloc4 as a replace-malloc lib when building with mozjemalloc -DIRS += ['jemalloc'] - if CONFIG['MOZ_REPLACE_MALLOC_LINKAGE'] == 'dummy library': DIRS += ['dummy'] |