Auto merge of #30985 - alexcrichton:downgrade-jemaloc, r=brson

We've been seeing a lot of timeouts in tests on the bots and investigation ended
pointing to jemalloc/jemalloc#315 as the culprit. Unfortunately it looks like
that doesn't seem to have a fix on the way soon, so let's temporarily downgrade
back to the previous version of jemalloc we were using (where #30434 was the
most recent upgrade)
This commit is contained in:
bors 2016-01-20 20:14:18 +00:00
commit 0b77e50b41
6 changed files with 14 additions and 7 deletions

9
configure vendored
View File

@ -550,7 +550,7 @@ CFG_SELF="$0"
CFG_CONFIGURE_ARGS="$@"
case "${CFG_SRC_DIR}" in
case "${CFG_SRC_DIR}" in
*\ * )
err "The path to the rust source directory contains spaces, which is not supported"
;;
@ -892,6 +892,13 @@ then
CFG_DISABLE_JEMALLOC=1
fi
if [ $CFG_OSTYPE = pc-windows-gnu ]
then
# FIXME(#31030) - there's not a great reason to disable jemalloc here
step_msg "on Windows, disabling jemalloc"
CFG_DISABLE_JEMALLOC=1
fi
# OS X 10.9, gcc is actually clang. This can cause some confusion in the build
# system, so if we find that gcc is clang, we should just use clang directly.
if [ $CFG_OSTYPE = apple-darwin -a -z "$CFG_ENABLE_CLANG" ]

@ -1 +1 @@
Subproject commit f84e30927284b0c500ed3eaf09e8e159da20ddaf
Subproject commit e24a1a025a1f214e40eedafe3b9c7b1d69937922

View File

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-msvc everything is the system allocator on msvc
// ignore-windows everything is the system allocator on windows
// ignore-musl no dylibs on musl yet
// ignore-bitrig no jemalloc on bitrig
// ignore-openbsd no jemalloc on openbsd

View File

@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// ignore-msvc everything is the system allocator on msvc
// ignore-windows everything is the system allocator on windows
// ignore-musl no dylibs on musl right now
// ignore-bitrig no jemalloc on bitrig
// ignore-openbsd no jemalloc on openbsd

View File

@ -10,9 +10,9 @@
#![feature(alloc_jemalloc, alloc_system)]
#[cfg(not(any(target_env = "msvc", target_os = "bitrig", target_os = "openbsd")))]
#[cfg(not(any(windows, target_os = "bitrig", target_os = "openbsd")))]
extern crate alloc_jemalloc;
#[cfg(any(target_env = "msvc", target_os = "bitrig", target_os = "openbsd"))]
#[cfg(any(windows, target_os = "bitrig", target_os = "openbsd"))]
extern crate alloc_system;
fn main() {

View File

@ -9,7 +9,7 @@
// except according to those terms.
// no-prefer-dynamic
// ignore-msvc no jemalloc on msvc
// ignore-windows no jemalloc on windows
// ignore-bitrig no jemalloc on bitrig
// ignore-openbsd no jemalloc on openbsd