---

yaml
---
r: 274783
b: refs/heads/stable
c: 7732c0a
h: refs/heads/master
i:
  274781: 37963c0
  274779: 0155ff2
  274775: af66e2e
  274767: b1f6bf2
  274751: c764d87

Author: bors

[refs]

@@ -29,7 +29,7 @@ refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f
 refs/tags/homu-tmp: c0221c8897db309a79990367476177b1230bb264
 refs/tags/1.0.0-beta: 8cbb92b53468ee2b0c2d3eeb8567005953d40828
-refs/heads/stable: bafea3bf78e75c99958ef15fd3d06652cb63133c
+refs/heads/stable: 7732c0aa9ea12262cbe46fa77c2fa636e8aecf6a
 refs/tags/1.0.0: 55bd4f8ff2b323f317ae89e254ce87162d52a375
 refs/tags/1.1.0: bc3c16f09287e5545c1d3f76b7abd54f2eca868b
 refs/tags/1.2.0: f557861f822c34f07270347b94b5280de20a597e

branches/stable/src/liballoc_jemalloc/lib.rs

@@ -56,8 +56,7 @@ const MIN_ALIGN: usize = 8;
 #[cfg(all(any(target_arch = "x86",
               target_arch = "x86_64",
               target_arch = "aarch64",
-              target_arch = "powerpc64",
-              target_arch = "powerpc64le")))]
+              target_arch = "powerpc64")))]
 const MIN_ALIGN: usize = 16;
 
 // MALLOCX_ALIGN(a) macro

branches/stable/src/librustc_trans/trans/cabi_powerpc64.rs

@@ -158,7 +158,7 @@ fn classify_ret_ty(ccx: &CrateContext, ty: Type) -> ArgType {
     }
 
     // The PowerPC64 big endian ABI doesn't return aggregates in registers
-    if ccx.sess().target.target.arch == "powerpc64" {
+    if ccx.sess().target.target.target_endian == "big" {
         return ArgType::indirect(ty, Some(Attribute::StructRet))
     }