diff options
| author | bors <bors@rust-lang.org> | 2016-01-15 11:59:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-01-15 11:59:11 +0000 |
| commit | 1f4e317e45349eb2d3c853e96bfd24dd574b36d1 (patch) | |
| tree | 88ad81e57e6ad22f242754edf6143167fda74a5a /src/libstd/sys | |
| parent | a70a60a02bca4c1fb75a0eb0ecf80acb73972f66 (diff) | |
| parent | 4f8d584aa586a4e31be3b73233d37cd0ee2ba03b (diff) | |
| download | rust-1f4e317e45349eb2d3c853e96bfd24dd574b36d1.tar.gz rust-1f4e317e45349eb2d3c853e96bfd24dd574b36d1.zip | |
Auto merge of #30929 - Manishearth:rollup, r=Manishearth
- Successful merges: #30591, #30781, #30836, #30864, #30896, #30898, #30908, #30921, #30925 - Failed merges:
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/common/libunwind.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/libstd/sys/common/libunwind.rs b/src/libstd/sys/common/libunwind.rs index feb05c7b560..77d1eed9623 100644 --- a/src/libstd/sys/common/libunwind.rs +++ b/src/libstd/sys/common/libunwind.rs @@ -83,7 +83,8 @@ pub const unwinder_private_data_size: usize = 2; #[cfg(any(target_arch = "mips", target_arch = "mipsel"))] pub const unwinder_private_data_size: usize = 2; -#[cfg(target_arch = "powerpc")] +#[cfg(any(target_arch = "powerpc", target_arch = "powerpc64", + target_arch = "powerpc64le"))] pub const unwinder_private_data_size: usize = 2; #[repr(C)] |