Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade jemalloc to 5.0.1 #45163

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Upgrade jemalloc to 5.0.1
  • Loading branch information
sfackler committed Oct 12, 2017

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
commit 648e44f611d4e24d6bdde02216e1917d78f4ebf4
2 changes: 1 addition & 1 deletion src/jemalloc
Submodule jemalloc updated 259 files
10 changes: 6 additions & 4 deletions src/liballoc_jemalloc/build.rs
Original file line number Diff line number Diff line change
@@ -69,6 +69,10 @@ fn main() {
let cflags = compiler.args()
.iter()
.map(|s| s.to_str().unwrap())
.filter(|&s| {
// separate function/data sections trigger errors with android's TLS emulation
!target.contains("android") || (s != "-ffunction-sections" && s != "-fdata-sections")
})
.collect::<Vec<_>>()
.join(" ");

@@ -78,6 +82,7 @@ fn main() {
.unwrap()
.replace("C:\\", "/c/")
.replace("\\", "/"))
.arg("--disable-cxx")
.current_dir(&native.out_dir)
.env("CC", compiler.path())
.env("EXTRA_CFLAGS", cflags.clone())
@@ -93,9 +98,7 @@ fn main() {
.env("AR", &ar)
.env("RANLIB", format!("{} s", ar.display()));

if target.contains("ios") {
cmd.arg("--disable-tls");
} else if target.contains("android") {
if target.contains("android") {
// We force android to have prefixed symbols because apparently
// replacement of the libc allocator doesn't quite work. When this was
// tested (unprefixed symbols), it was found that the `realpath`
@@ -106,7 +109,6 @@ fn main() {
// If the test suite passes, however, without symbol prefixes then we
// should be good to go!
cmd.arg("--with-jemalloc-prefix=je_");
cmd.arg("--disable-tls");
} else if target.contains("dragonfly") || target.contains("musl") {
cmd.arg("--with-jemalloc-prefix=je_");
}