Followup fixes for Bug 515492.
authorKyle Huey <khuey@kylehuey.com>
Mon, 27 Jun 2011 16:11:45 -0700
changeset 72417 929f956a1a42383069d55b4ffeaf2fa3f084bb25
parent 72416 d77cddcc9bd699e0d1ee209cbc0099b6acd54427
child 72418 749eeb73cda4e622bb7614d4625fd17e58a2f41a
push id159
push usereakhgari@mozilla.com
push dateTue, 16 Aug 2011 17:53:11 +0000
treeherdermozilla-beta@8786e3e49240 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs515492
milestone7.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
Followup fixes for Bug 515492.
memory/jemalloc/Makefile.in
memory/jemalloc/jemalloc.h
--- a/memory/jemalloc/Makefile.in
+++ b/memory/jemalloc/Makefile.in
@@ -223,25 +223,26 @@ mozcrt.lib:: $(IMPORT_LIBRARY) msvc_modi
 
 # Put the fixed object file back in
 msvc_modified.lib:: msvc_removed.lib crtdll_fixed.obj
 	lib -OUT:$@ $^
 
 # Fix the object file
 crtdll_fixed.obj:: crtdll.obj
 	$(PYTHON) $(srcdir)/fixcrt.py
-  
+
+# Find the path of crtdll.obj
 CRTDLL_FULLPATH=$(subst \,\\,$(shell lib -list msvc_combined.lib | grep crtdll\\.obj))
 
 # Remove the broken object file, only after we have extracted it
 msvc_removed.lib:: msvc_combined.lib crtdll.obj
 	lib -OUT:$@ msvc_combined.lib -REMOVE:$(CRTDLL_FULLPATH)
 
 # Extract the broken object file out of the combined library
 crtdll.obj:: msvc_combined.lib
 	lib -OUT:$@ $^ -EXTRACT:$(CRTDLL_FULLPATH)
 
 # Grab both CRT libraries and combine them into one library to simplify things
 msvc_combined.lib::
-	lib -OUT:$@ msvcrt.lib msvcprt.lib 
+	lib -OUT:$@ $(WIN32_CRT_LIBS)
 
 endif
 endif
--- a/memory/jemalloc/jemalloc.h
+++ b/memory/jemalloc/jemalloc.h
@@ -55,18 +55,22 @@ void	*je_malloc(size_t size);
 void	*je_valloc(size_t size);
 void	*je_calloc(size_t num, size_t size);
 void	*je_realloc(void *ptr, size_t size);
 void	je_free(void *ptr);
 void *je_memalign(size_t alignment, size_t size);
 int	je_posix_memalign(void **memptr, size_t alignment, size_t size);
 char    *je_strndup(const char *src, size_t len);
 char    *je_strdup(const char *src);
+#if defined(MOZ_MEMORY_ANDROID)
+size_t  je_malloc_usable_size(void *ptr)
+#else
 size_t	je_malloc_usable_size(const void *ptr);
 #endif
+#endif
 
 /* Linux has memalign and malloc_usable_size */
 #if !defined(MOZ_MEMORY_LINUX)
 void	*memalign(size_t alignment, size_t size);
 size_t	malloc_usable_size(const void *ptr);
 #endif /* MOZ_MEMORY_LINUX */
 
 void	jemalloc_stats(jemalloc_stats_t *stats);