diff options
| author | bors <bors@rust-lang.org> | 2016-02-02 17:11:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-02-02 17:11:48 +0000 |
| commit | 2dc132e4d25cf7424deddf6c33c6059d93ff5248 (patch) | |
| tree | 70a45c6866b8301c4a401ef28a61196f22541022 /src/libstd/rand/os.rs | |
| parent | 59b7c907a3e3dd8b263297adf6ff0515fac125e3 (diff) | |
| parent | 8f803c202681fa137fca691df999ac3f335d29c1 (diff) | |
| download | rust-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/rand/os.rs')
| -rw-r--r-- | src/libstd/rand/os.rs | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/libstd/rand/os.rs b/src/libstd/rand/os.rs index 619f100f1a1..8d92909faf5 100644 --- a/src/libstd/rand/os.rs +++ b/src/libstd/rand/os.rs @@ -31,8 +31,7 @@ mod imp { target_arch = "arm", target_arch = "aarch64", target_arch = "powerpc", - target_arch = "powerpc64", - target_arch = "powerpc64le")))] + target_arch = "powerpc64")))] fn getrandom(buf: &mut [u8]) -> libc::c_long { #[cfg(target_arch = "x86_64")] const NR_GETRANDOM: libc::c_long = 318; @@ -40,8 +39,7 @@ mod imp { const NR_GETRANDOM: libc::c_long = 355; #[cfg(target_arch = "arm")] const NR_GETRANDOM: libc::c_long = 384; - #[cfg(any(target_arch = "powerpc", target_arch = "powerpc64", - target_arch = "powerpc64le"))] + #[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))] const NR_GETRANDOM: libc::c_long = 359; #[cfg(target_arch = "aarch64")] const NR_GETRANDOM: libc::c_long = 278; @@ -57,8 +55,7 @@ mod imp { target_arch = "arm", target_arch = "aarch64", target_arch = "powerpc", - target_arch = "powerpc64", - target_arch = "powerpc64le"))))] + target_arch = "powerpc64"))))] fn getrandom(_buf: &mut [u8]) -> libc::c_long { -1 } fn getrandom_fill_bytes(v: &mut [u8]) { @@ -96,8 +93,7 @@ mod imp { target_arch = "arm", target_arch = "aarch64", target_arch = "powerpc", - target_arch = "powerpc64", - target_arch = "powerpc64le")))] + target_arch = "powerpc64")))] fn is_getrandom_available() -> bool { use sync::atomic::{AtomicBool, Ordering}; use sync::Once; @@ -126,8 +122,7 @@ mod imp { target_arch = "arm", target_arch = "aarch64", target_arch = "powerpc", - target_arch = "powerpc64", - target_arch = "powerpc64le"))))] + target_arch = "powerpc64"))))] fn is_getrandom_available() -> bool { false } /// A random number generator that retrieves randomness straight from |