Auto merge of #31525 - antonblanchard:powerpc64_merge4, r=alexcrichton
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:
commit
f5f8e0bfbe
2 changed files with 2 additions and 3 deletions
|
@ -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
|
||||
|
|
|
@ -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))
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue