mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Auto merge of #31525 - antonblanchard:powerpc64_merge4, r=alexcrichton

Browse source 
We no longer have a separate powerpc64 and powerpc64le target_arch, and instead use target_endian to select between the two. These patches fix a couple of remaining issues.
This commit is contained in:
bors 2016-02-11 10:56:45 +00:00
commit f5f8e0bfbe
2 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/liballoc_jemalloc/lib.rs
View file

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

2
src/librustc_trans/trans/cabi_powerpc64.rs
View file

@ -158,7 +158,7 @@ fn classify_ret_ty(ccx: &CrateContext, ty: Type) -> ArgType {
} }
// The PowerPC64 big endian ABI doesn't return aggregates in registers // 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)) return ArgType::indirect(ty, Some(Attribute::StructRet))
} }