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/liballoc_system | |
| 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/liballoc_system')
| -rw-r--r-- | src/liballoc_system/lib.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/liballoc_system/lib.rs b/src/liballoc_system/lib.rs index a4e98e413bb..ffb6999d6e3 100644 --- a/src/liballoc_system/lib.rs +++ b/src/liballoc_system/lib.rs @@ -29,7 +29,9 @@ extern crate libc; target_arch = "arm", target_arch = "mips", target_arch = "mipsel", - target_arch = "powerpc")))] + target_arch = "powerpc", + target_arch = "powerpc64", + target_arch = "powerpc64le")))] const MIN_ALIGN: usize = 8; #[cfg(all(any(target_arch = "x86_64", target_arch = "aarch64")))] |