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.

Sign up for GitHub

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

Jump to bottom

Upgrade jemalloc to 5.0.1 #45163

Closed
wants to merge 1 commit into from
+7 −5
Closed

Upgrade jemalloc to 5.0.1 #45163

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion src/jemalloc
Open in desktop
Submodule jemalloc updated 259 files
10 changes: 6 additions & 4 deletions src/liballoc_jemalloc/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(" ");

Expand All @@ -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())
Expand All @@ -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`
Expand All @@ -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_");
}
Expand Down