about summary refs log tree commit diff
path: root/src/liballoc_system
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-02-02 17:11:48 +0000
committerbors <bors@rust-lang.org>2016-02-02 17:11:48 +0000
commit2dc132e4d25cf7424deddf6c33c6059d93ff5248 (patch)
tree70a45c6866b8301c4a401ef28a61196f22541022 /src/liballoc_system
parent59b7c907a3e3dd8b263297adf6ff0515fac125e3 (diff)
parent8f803c202681fa137fca691df999ac3f335d29c1 (diff)
downloadrust-2dc132e4d25cf7424deddf6c33c6059d93ff5248.tar.gz
rust-2dc132e4d25cf7424deddf6c33c6059d93ff5248.zip
Auto merge of #31312 - alexcrichton:no-le-in-powerpc64le, r=alexcrichton
Currently the `mipsel-unknown-linux-gnu` target doesn't actually set the
`target_arch` value to `mipsel` but it rather uses `mips`. Alternatively the
`powerpc64le` target does indeed set the `target_arch` as `powerpc64le`,
causing a bit of inconsistency between theset two.

As these are just the same instance of one instruction set, let's use
`target_endian` to switch between them and only set the `target_arch` as one
value. This should cut down on the number of `#[cfg]` annotations necessary and
all around be a little more ergonomic.
Diffstat (limited to 'src/liballoc_system')
-rw-r--r--src/liballoc_system/lib.rs4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs
index 8a9e32daa72..8423492caf1 100644
--- a/src/liballoc_system/lib.rs
+++ b/src/liballoc_system/lib.rs
@@ -29,10 +29,8 @@ extern crate libc;
 #[cfg(all(any(target_arch = "x86",
               target_arch = "arm",
               target_arch = "mips",
-              target_arch = "mipsel",
               target_arch = "powerpc",
-              target_arch = "powerpc64",
-              target_arch = "powerpc64le")))]
+              target_arch = "powerpc64")))]
 const MIN_ALIGN: usize = 8;
 #[cfg(all(any(target_arch = "x86_64",
               target_arch = "aarch64")))]