Skip to content

Commit f5f8e0b

Browse files
committed
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.
2 parents 060848c + afdf179 commit f5f8e0b

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

src/liballoc_jemalloc/lib.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,7 @@ const MIN_ALIGN: usize = 8;
5656
#[cfg(all(any(target_arch = "x86",
5757
target_arch = "x86_64",
5858
target_arch = "aarch64",
59-
target_arch = "powerpc64",
60-
target_arch = "powerpc64le")))]
59+
target_arch = "powerpc64")))]
6160
const MIN_ALIGN: usize = 16;
6261

6362
// MALLOCX_ALIGN(a) macro

src/librustc_trans/trans/cabi_powerpc64.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ fn classify_ret_ty(ccx: &CrateContext, ty: Type) -> ArgType {
158158
}
159159

160160
// The PowerPC64 big endian ABI doesn't return aggregates in registers
161-
if ccx.sess().target.target.arch == "powerpc64" {
161+
if ccx.sess().target.target.target_endian == "big" {
162162
return ArgType::indirect(ty, Some(Attribute::StructRet))
163163
}
164164

0 commit comments

Comments
 (0)