From 40ed16471897ccb871429e355e8dd60d0e03c333 Mon Sep 17 00:00:00 2001 From: Rust Maintainers Date: Wed, 4 Jan 2017 20:34:56 +0000 Subject: [PATCH] u-ignoretest-jemalloc Gbp-Pq: Name u-ignoretest-jemalloc.patch --- src/librustc_back/target/s390x_unknown_linux_gnu.rs | 2 ++ src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs | 4 ++-- src/test/run-pass/allocator-default.rs | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/librustc_back/target/s390x_unknown_linux_gnu.rs b/src/librustc_back/target/s390x_unknown_linux_gnu.rs index 6e2dd6cd67..671fb4f431 100644 --- a/src/librustc_back/target/s390x_unknown_linux_gnu.rs +++ b/src/librustc_back/target/s390x_unknown_linux_gnu.rs @@ -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(), diff --git a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs index 02c271ab24..9077f1c7ef 100644 --- a/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs +++ b/src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs @@ -29,9 +29,9 @@ 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", not(any(target_arch = "aarch64", target_arch = "mips", target_arch = "mips64", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x"))), target_os = "macos"))] extern crate alloc_system; -#[cfg(not(any(target_os = "linux", target_os = "macos")))] +#[cfg(not(any(all(target_os = "linux", not(any(target_arch = "aarch64", target_arch = "mips", target_arch = "mips64", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x"))), target_os = "macos")))] extern crate allocator1; fn main() { diff --git a/src/test/run-pass/allocator-default.rs b/src/test/run-pass/allocator-default.rs index 32ed2b3301..9533e67ca9 100644 --- a/src/test/run-pass/allocator-default.rs +++ b/src/test/run-pass/allocator-default.rs @@ -10,7 +10,7 @@ #![feature(alloc_jemalloc)] -#[cfg(any(target_os = "linux", target_os = "macos"))] +#[cfg(any(all(target_os = "linux", not(any(target_arch = "aarch64", target_arch = "mips", target_arch = "mips64", target_arch = "powerpc", target_arch = "powerpc64", target_arch = "s390x"))), target_os = "macos"))] extern crate alloc_jemalloc; fn main() { -- 2.30.2