Skip to content

More jemalloc fixes #38675

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

Merged
merged 2 commits into from
Jan 13, 2017
Merged

More jemalloc fixes #38675

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
417953f
Disable jemalloc on s390x as well (closes #38596)
infinity0 Dec 29, 2016
cadebc7
Disable jemalloc tests on platforms where it is disabled (closes #38612)
infinity0 Jan 12, 2017
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: 2 additions & 0 deletions src/librustc_back/target/s390x_unknown_linux_gnu.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ pub fn target() -> TargetResult {
// Pass the -vector feature string to LLVM to respect this assumption.
base.features = "-vector".to_string();
base.max_atomic_width = Some(64);
// see #36994
base.exe_allocation_crate = "alloc_system".to_string();

Ok(Target {
llvm_target: "s390x-unknown-linux-gnu".to_string(),
Expand Down
6 changes: 4 additions & 2 deletions src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,11 @@ extern crate allocator_dylib2;
// ensure we get the same error.
//
// So long as we CI linux/OSX we should be good.
#[cfg(any(target_os = "linux", target_os = "macos"))]
#[cfg(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
target_os = "macos"))]
extern crate alloc_system;
#[cfg(not(any(target_os = "linux", target_os = "macos")))]
#[cfg(not(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
target_os = "macos")))]
extern crate allocator1;

fn main() {
Expand Down
3 changes: 2 additions & 1 deletion src/test/run-pass/allocator-default.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@

#![feature(alloc_jemalloc)]

#[cfg(any(target_os = "linux", target_os = "macos"))]
#[cfg(any(all(target_os = "linux", any(target_arch = "x86", target_arch = "x86_64")),
target_os = "macos"))]
extern crate alloc_jemalloc;

fn main() {
Expand Down