mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-28 23:31:56 +00:00
Bug 702250 - Disable jemalloc on mac 10.5 due to crash in ozone_size (apparent OS bug). r=khuey
This is likely to regress a number of benchmarks. --HG-- extra : rebase_source : 6831d8b3a846ec3193449132bef1648d426356db
This commit is contained in:
parent
b74c7dc6e2
commit
f12b89e5cb
@ -2350,7 +2350,10 @@ case "$target" in
|
||||
MKCSHLIB='$(CC) $(CFLAGS) $(DSO_PIC_CFLAGS) $(DSO_LDOPTS) -o $@'
|
||||
MOZ_OPTIMIZE_FLAGS="-O3"
|
||||
_PEDANTIC=
|
||||
MOZ_MEMORY=1
|
||||
# Statically disable jemalloc on 10.5 and 32-bit 10.6. See bug 702250.
|
||||
if test "$HAVE_64BIT_OS"; then
|
||||
MOZ_MEMORY=1
|
||||
fi
|
||||
CFLAGS="$CFLAGS -fno-common"
|
||||
CXXFLAGS="$CXXFLAGS -fno-common"
|
||||
DLL_SUFFIX=".dylib"
|
||||
|
@ -6063,13 +6063,16 @@ MALLOC_OUT:
|
||||
default_zone = malloc_default_zone();
|
||||
|
||||
/*
|
||||
* We only use jemalloc with versions of MacOS we've seen (10.5, 10.6, and
|
||||
* 10.7). We'll have to update our code to work with newer versions,
|
||||
* because the malloc zone layout is likely to change.
|
||||
* We only use jemalloc with MacOS 10.6 and 10.7. jemalloc is disabled
|
||||
* on 32-bit builds (10.5 and 32-bit 10.6) due to bug 702250, an
|
||||
* apparent MacOS bug. In fact, this code isn't even compiled on
|
||||
* 32-bit builds.
|
||||
*
|
||||
* We'll have to update our code to work with newer versions, because
|
||||
* the malloc zone layout is likely to change.
|
||||
*/
|
||||
|
||||
osx_use_jemalloc = (default_zone->version == LEOPARD_MALLOC_ZONE_T_VERSION ||
|
||||
default_zone->version == SNOW_LEOPARD_MALLOC_ZONE_T_VERSION ||
|
||||
osx_use_jemalloc = (default_zone->version == SNOW_LEOPARD_MALLOC_ZONE_T_VERSION ||
|
||||
default_zone->version == LION_MALLOC_ZONE_T_VERSION);
|
||||
|
||||
/* Allow us dynamically turn off jemalloc for testing. */
|
||||
|
Loading…
Reference in New Issue
Block a user