bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #31312 - alexcrichton:no-le-in-powerpc64le, r=alexcrichton

Browse source 
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.
This commit is contained in:
bors 2016-02-02 17:11:48 +00:00
commit 2dc132e4d2
13 changed files with 17 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/libstd/os/linux/raw.rs
View file

@ -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};