diff options
| author | bors <bors@rust-lang.org> | 2016-02-11 10:56:45 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-11 10:56:45 +0000 |
| commit | f5f8e0bfbeee2abc425f26a3ad36430f23010e69 (patch) | |
| tree | 1b8caba3ed5a145048de53f90f9ac0365337a9b5 /src/liballoc_jemalloc/lib.rs | |
| parent | 060848c31534284ed06cd63c5dbb41e2e839d2b0 (diff) | |
| parent | afdf179d84dc4aa290c38604b5f35b1ef669fd65 (diff) | |
| download | rust-f5f8e0bfbeee2abc425f26a3ad36430f23010e69.tar.gz rust-f5f8e0bfbeee2abc425f26a3ad36430f23010e69.zip | |
Auto merge of #31525 - antonblanchard:powerpc64_merge4, r=alexcrichton
We no longer have a separate powerpc64 and powerpc64le target_arch, and instead use target_endian to select between the two. These patches fix a couple of remaining issues.
Diffstat (limited to 'src/liballoc_jemalloc/lib.rs')
| -rw-r--r-- | src/liballoc_jemalloc/lib.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/liballoc_jemalloc/lib.rs b/src/liballoc_jemalloc/lib.rs index 8bdbd1a926f..d02e9e4ba13 100644 --- a/src/liballoc_jemalloc/lib.rs +++ b/src/liballoc_jemalloc/lib.rs @@ -56,8 +56,7 @@ const MIN_ALIGN: usize = 8; #[cfg(all(any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64", - target_arch = "powerpc64", - target_arch = "powerpc64le")))] + target_arch = "powerpc64")))] const MIN_ALIGN: usize = 16; // MALLOCX_ALIGN(a) macro |