diff options
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/env.rs | 12 | ||||
| -rw-r--r-- | src/libstd/os/linux/raw.rs | 6 | ||||
| -rw-r--r-- | src/libstd/os/raw.rs | 6 | ||||
| -rw-r--r-- | src/libstd/rand/os.rs | 15 | ||||
| -rw-r--r-- | src/libstd/sys/common/libunwind.rs | 5 |
5 files changed, 11 insertions, 33 deletions
diff --git a/src/libstd/env.rs b/src/libstd/env.rs index db136190082..410d7a6c91f 100644 --- a/src/libstd/env.rs +++ b/src/libstd/env.rs @@ -613,10 +613,8 @@ pub mod consts { /// - arm /// - aarch64 /// - mips - /// - mipsel /// - powerpc /// - powerpc64 - /// - powerpc64le #[stable(feature = "env", since = "1.0.0")] pub const ARCH: &'static str = super::arch::ARCH; @@ -859,11 +857,6 @@ mod arch { pub const ARCH: &'static str = "mips"; } -#[cfg(target_arch = "mipsel")] -mod arch { - pub const ARCH: &'static str = "mipsel"; -} - #[cfg(target_arch = "powerpc")] mod arch { pub const ARCH: &'static str = "powerpc"; @@ -874,11 +867,6 @@ mod arch { pub const ARCH: &'static str = "powerpc64"; } -#[cfg(target_arch = "powerpc64le")] -mod arch { - pub const ARCH: &'static str = "powerpc64le"; -} - #[cfg(target_arch = "le32")] mod arch { pub const ARCH: &'static str = "le32"; 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}; diff --git a/src/libstd/os/raw.rs b/src/libstd/os/raw.rs index 31d889fd422..bd353f066cf 100644 --- a/src/libstd/os/raw.rs +++ b/src/libstd/os/raw.rs @@ -16,15 +16,13 @@ all(target_os = "linux", any(target_arch = "aarch64", target_arch = "arm", target_arch = "powerpc", - target_arch = "powerpc64", - target_arch = "powerpc64le"))))] + target_arch = "powerpc64"))))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = u8; #[cfg(not(any(target_os = "android", all(target_os = "linux", any(target_arch = "aarch64", target_arch = "arm", target_arch = "powerpc", - target_arch = "powerpc64", - target_arch = "powerpc64le")))))] + target_arch = "powerpc64")))))] #[stable(feature = "raw_os", since = "1.1.0")] pub type c_char = i8; #[stable(feature = "raw_os", since = "1.1.0")] pub type c_schar = i8; #[stable(feature = "raw_os", since = "1.1.0")] pub type c_uchar = u8; 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 diff --git a/src/libstd/sys/common/libunwind.rs b/src/libstd/sys/common/libunwind.rs index 179a27a2ec8..f44a8cb21e9 100644 --- a/src/libstd/sys/common/libunwind.rs +++ b/src/libstd/sys/common/libunwind.rs @@ -80,11 +80,10 @@ pub const unwinder_private_data_size: usize = 5; #[cfg(target_arch = "aarch64")] pub const unwinder_private_data_size: usize = 2; -#[cfg(any(target_arch = "mips", target_arch = "mipsel"))] +#[cfg(target_arch = "mips")] pub const unwinder_private_data_size: usize = 2; -#[cfg(any(target_arch = "powerpc", target_arch = "powerpc64", - target_arch = "powerpc64le"))] +#[cfg(any(target_arch = "powerpc", target_arch = "powerpc64"))] pub const unwinder_private_data_size: usize = 2; #[repr(C)] |