Bug 580408 - Move Mozilla fork of jemalloc to memory/mozjemalloc. r=khuey
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 07 Jun 2012 10:41:58 +0200
changeset 96034 87bd340fac6aa9f70c42bb4a8fbe0b7325277b0d
parent 96033 30fc3d3e10d3fe01b794bc96648bb44bcf780e3a
child 96035 c27de97f078dc7c2276af6484b718b54730180d8
push id10361
push usermh@glandium.org
push dateThu, 07 Jun 2012 08:43:02 +0000
treeherdermozilla-inbound@5a1dc5b1ecbb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerskhuey
bugs580408
milestone16.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 580408 - Move Mozilla fork of jemalloc to memory/mozjemalloc. r=khuey
Makefile.in
allmakefiles.sh
memory/build/Makefile.in
memory/jemalloc/Makefile.in
memory/jemalloc/jemalloc.c
memory/jemalloc/jemalloc.h
memory/jemalloc/jemalloc_types.h
memory/jemalloc/linkedlist.h
memory/jemalloc/osx_zone_types.h
memory/jemalloc/ql.h
memory/jemalloc/qr.h
memory/jemalloc/rb.h
memory/mozjemalloc/Makefile.in
memory/mozjemalloc/jemalloc.c
memory/mozjemalloc/jemalloc.h
memory/mozjemalloc/jemalloc_types.h
memory/mozjemalloc/linkedlist.h
memory/mozjemalloc/osx_zone_types.h
memory/mozjemalloc/ql.h
memory/mozjemalloc/qr.h
memory/mozjemalloc/rb.h
toolkit/content/license.html
--- a/Makefile.in
+++ b/Makefile.in
@@ -42,17 +42,17 @@ tier_base_dirs += \
 endif
 ifeq (gonk,$(MOZ_WIDGET_TOOLKIT))
 tier_base_dirs += \
   other-licenses/android \
   $(NULL)
 endif
 
 ifdef MOZ_MEMORY
-tier_base_dirs += memory/jemalloc
+tier_base_dirs += memory/mozjemalloc
 tier_base_dirs += memory/build
 endif
 tier_base_dirs += \
   mozglue \
   memory/mozalloc \
   $(NULL)
 endif
 
--- a/allmakefiles.sh
+++ b/allmakefiles.sh
@@ -56,17 +56,17 @@ if [ ! "$LIBXUL_SDK" ]; then
   fi
   add_makefiles "
     memory/mozalloc/Makefile
     mozglue/Makefile
     mozglue/build/Makefile
   "
   if [ "$MOZ_MEMORY" ]; then
     add_makefiles "
-      memory/jemalloc/Makefile
+      memory/mozjemalloc/Makefile
       memory/build/Makefile
     "
   fi
   if [ "$MOZ_WIDGET_TOOLKIT" = "android" ]; then
     add_makefiles "
       other-licenses/android/Makefile
       other-licenses/skia-npapi/Makefile
       mozglue/android/Makefile
--- a/memory/build/Makefile.in
+++ b/memory/build/Makefile.in
@@ -15,11 +15,11 @@ FORCE_STATIC_LIB = 1
 STLFLAGS =
 ifdef MOZ_GLUE_PROGRAM_LDFLAGS
 SDK_LIBRARY = $(REAL_LIBRARY)
 DIST_INSTALL = 1
 endif
 
 CSRCS = extraMallocFuncs.c
 
-SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/jemalloc)
+SHARED_LIBRARY_LIBS += $(call EXPAND_LIBNAME_PATH,jemalloc,$(DEPTH)/memory/mozjemalloc)
 
 include $(topsrcdir)/config/rules.mk
rename from memory/jemalloc/Makefile.in
rename to memory/mozjemalloc/Makefile.in
rename from memory/jemalloc/jemalloc.c
rename to memory/mozjemalloc/jemalloc.c
rename from memory/jemalloc/jemalloc.h
rename to memory/mozjemalloc/jemalloc.h
rename from memory/jemalloc/jemalloc_types.h
rename to memory/mozjemalloc/jemalloc_types.h
rename from memory/jemalloc/linkedlist.h
rename to memory/mozjemalloc/linkedlist.h
rename from memory/jemalloc/osx_zone_types.h
rename to memory/mozjemalloc/osx_zone_types.h
rename from memory/jemalloc/ql.h
rename to memory/mozjemalloc/ql.h
rename from memory/jemalloc/qr.h
rename to memory/mozjemalloc/qr.h
rename from memory/jemalloc/rb.h
rename to memory/mozjemalloc/rb.h
--- a/toolkit/content/license.html
+++ b/toolkit/content/license.html
@@ -1708,17 +1708,17 @@ 5. Disclaimer/Limitation of Liability: T
    ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 </pre>
 
     <hr>
 
     <h1><a id="jemalloc"></a>jemalloc License</h1>
 
     <p>This license applies to files in the directory
-    <span class="path">memory/jemalloc/</span>.
+    <span class="path">memory/mozjemalloc/</span>.
     </p>
 
 <pre>
 Copyright (C) 2006-2008 Jason Evans &lt;jasone@FreeBSD.org&gt;.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions