about summary refs log tree commit diff
path: root/src/libstd/os/linux
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/libstd/os/linux
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/libstd/os/linux')
-rw-r--r--src/libstd/os/linux/raw.rs6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/libstd/os/linux/raw.rs b/src/libstd/os/linux/raw.rs
index 286823552c2..cc7fa23546b 100644
--- a/src/libstd/os/linux/raw.rs
+++ b/src/libstd/os/linux/raw.rs
@@ -86,8 +86,7 @@ mod arch {
     }
 }
 
-#[cfg(any(target_arch = "mips",
-          target_arch = "mipsel"))]
+#[cfg(target_arch = "mips")]
 mod arch {
     use super::mode_t;
     use os::raw::{c_long, c_ulong};
@@ -214,8 +213,7 @@ mod arch {
     }
 }
 
-#[cfg(any(target_arch = "x86_64", target_arch = "powerpc64",
-          target_arch = "powerpc64le"))]
+#[cfg(any(target_arch = "x86_64", target_arch = "powerpc64"))]
 mod arch {
     use super::{dev_t, mode_t};
     use os::raw::{c_long, c_int};