From 43034a36e132ac4394e26cbfb4d855bd6f5114b3 Mon Sep 17 00:00:00 2001 From: wolfbeast Date: Fri, 27 Apr 2018 19:16:45 +0200 Subject: Remove jemalloc 4 from our tree. --- memory/replace/jemalloc/moz.build | 31 ------------------------------- memory/replace/jemalloc/pthread_atfork.c | 10 ---------- 2 files changed, 41 deletions(-) delete mode 100644 memory/replace/jemalloc/moz.build delete mode 100644 memory/replace/jemalloc/pthread_atfork.c (limited to 'memory/replace/jemalloc') diff --git a/memory/replace/jemalloc/moz.build b/memory/replace/jemalloc/moz.build deleted file mode 100644 index 5e907af55..000000000 --- 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 6e737f072..000000000 --- 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; -} -- cgit v1.2.3