Bug 1141660 - Always export memalign from jemalloc, even on Windows. r=njn
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 11 Mar 2015 11:37:14 +0900
changeset 232997 80555e0558a36842b4aee1ccbcfe59d7d84981c9
parent 232996 22aea188dac597f60c9182eb337240b16498fb69
child 232998 84f6168fbf032e9207de3a918c1fbbe79b8ea7f6
push id28399
push userryanvm@gmail.com
push dateWed, 11 Mar 2015 19:47:52 +0000
treeherdermozilla-central@30916c9ca768 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnjn
bugs1141660
milestone39.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 1141660 - Always export memalign from jemalloc, even on Windows. r=njn
configure.in
--- a/configure.in
+++ b/configure.in
@@ -9087,19 +9087,21 @@ case "$host" in
     FIXED_EGREP="egrep"
     ;;
 esac
 
 # Run jemalloc configure script
 
 if test -z "$MOZ_NATIVE_JEMALLOC" -a "$MOZ_MEMORY" && test -n "$MOZ_JEMALLOC3" -o -n "$MOZ_REPLACE_MALLOC"; then
   ac_configure_args="--build=$build --host=$target --enable-stats --with-jemalloc-prefix=je_ --disable-valgrind"
+  # We're using memalign for _aligned_malloc in memory/build/mozmemory_wrap.c
+  # on Windows, so just export memalign on all platforms.
+  ac_configure_args="$ac_configure_args ac_cv_func_memalign=yes"
   if test -n "$MOZ_REPLACE_MALLOC"; then
-    # When using replace_malloc, we always want memalign and valloc exported from jemalloc.
-    ac_configure_args="$ac_configure_args ac_cv_func_memalign=yes"
+    # When using replace_malloc, we always want valloc exported from jemalloc.
     ac_configure_args="$ac_configure_args ac_cv_func_valloc=yes"
   fi
   if test -n "$MOZ_JEMALLOC3"; then
     case "${OS_ARCH}" in
       WINNT|Darwin)
         # We want jemalloc functions to be kept hidden on both Mac and Windows
         # See memory/build/mozmemory_wrap.h for details.
         ac_configure_args="$ac_configure_args --without-export"