diff options
| author | bors <bors@rust-lang.org> | 2017-01-13 00:56:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-01-13 00:56:45 +0000 |
| commit | 1a2ed98d344b6cbddc57db8841b42f935877e08d (patch) | |
| tree | 28d0b1a96c96bf3a28cc8e3982526b7fff2d35fd | |
| parent | dd8e68d0da8f78b0aee367ddf154b3942940f3d3 (diff) | |
| parent | cadebc7571074e4c17cef267d7269e91fd12ccf8 (diff) | |
| download | rust-1a2ed98d344b6cbddc57db8841b42f935877e08d.tar.gz rust-1a2ed98d344b6cbddc57db8841b42f935877e08d.zip | |
Auto merge of #38675 - infinity0:more-jemalloc-fixes, r=alexcrichton
More jemalloc fixes - Disable jemalloc on s390x as well (closes #38596) - Disable jemalloc tests on platforms where it is disabled (closes #38612)
| -rw-r--r-- | src/librustc_back/target/s390x_unknown_linux_gnu.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs | 6 | ||||
| -rw-r--r-- | src/test/run-pass/allocator-default.rs | 3 |
3 files changed, 8 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 6e2dd6cd67c..671fb4f4319 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 02c271ab24d..5d566c0e0b4 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,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() { diff --git a/src/test/run-pass/allocator-default.rs b/src/test/run-pass/allocator-default.rs index 32ed2b33011..0a02e8072b9 100644 --- a/src/test/run-pass/allocator-default.rs +++ b/src/test/run-pass/allocator-default.rs @@ -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() { |