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/sys | |
| 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/sys')
| -rw-r--r-- | src/libstd/sys/common/libunwind.rs | 5 |
1 files changed, 2 insertions, 3 deletions
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)] |