Skip to content

Commit 13bc781

Browse files
authored
Unrolled build for #150966
Rollup merge of #150966 - arch-powerpc64le, r=petrochenkov rustc_target: Remove unused Arch::PowerPC64LE This variant has been added in #147645, but actually unused since target_arch for powerpc64le- targets is "powerpc64". (The difference between powerpc64- and powerpc64le- targets is identified by target_endian.) Note: This is an internal cleanup and does NOT remove `powerpc64le-*` targets.
2 parents 86a49fd + 7d80e7d commit 13bc781

File tree

8 files changed

+6
-26
lines changed

8 files changed

+6
-26
lines changed

‎compiler/rustc_codegen_llvm/src/mono_item.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ impl CodegenCx<'_, '_> {
144144
}
145145

146146
// PowerPC64 prefers TOC indirection to avoid copy relocations.
147-
if matches!(self.tcx.sess.target.arch, Arch::PowerPC64 | Arch::PowerPC64LE) {
147+
if self.tcx.sess.target.arch == Arch::PowerPC64 {
148148
return false;
149149
}
150150

‎compiler/rustc_codegen_llvm/src/va_arg.rs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1064,15 +1064,6 @@ pub(super) fn emit_va_arg<'ll, 'tcx>(
10641064
AllowHigherAlign::Yes,
10651065
ForceRightAdjust::Yes,
10661066
),
1067-
Arch::PowerPC64LE => emit_ptr_va_arg(
1068-
bx,
1069-
addr,
1070-
target_ty,
1071-
PassMode::Direct,
1072-
SlotSize::Bytes8,
1073-
AllowHigherAlign::Yes,
1074-
ForceRightAdjust::No,
1075-
),
10761067
Arch::LoongArch32 => emit_ptr_va_arg(
10771068
bx,
10781069
addr,

‎compiler/rustc_span/src/symbol.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1725,7 +1725,6 @@ symbols! {
17251725
postfix_match,
17261726
powerpc,
17271727
powerpc64,
1728-
powerpc64le,
17291728
powerpc_target_feature,
17301729
powf16,
17311730
powf32,

‎compiler/rustc_target/src/asm/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ impl InlineAsmArch {
261261
Arch::Mips | Arch::Mips32r6 => Some(Self::Mips),
262262
Arch::Mips64 | Arch::Mips64r6 => Some(Self::Mips64),
263263
Arch::PowerPC => Some(Self::PowerPC),
264-
Arch::PowerPC64 | Arch::PowerPC64LE => Some(Self::PowerPC64),
264+
Arch::PowerPC64 => Some(Self::PowerPC64),
265265
Arch::S390x => Some(Self::S390x),
266266
Arch::Sparc => Some(Self::Sparc),
267267
Arch::Sparc64 => Some(Self::Sparc64),

‎compiler/rustc_target/src/callconv/mod.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -702,7 +702,7 @@ impl<'a, Ty> FnAbi<'a, Ty> {
702702
Arch::RiscV32 | Arch::RiscV64 => riscv::compute_abi_info(cx, self),
703703
Arch::Wasm32 | Arch::Wasm64 => wasm::compute_abi_info(cx, self),
704704
Arch::Bpf => bpf::compute_abi_info(cx, self),
705-
arch @ (Arch::PowerPC64LE | Arch::SpirV | Arch::Other(_)) => {
705+
arch @ (Arch::SpirV | Arch::Other(_)) => {
706706
panic!("no lowering implemented for {arch}")
707707
}
708708
}

‎compiler/rustc_target/src/spec/mod.rs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1873,7 +1873,6 @@ crate::target_spec_enum! {
18731873
Nvptx64 = "nvptx64",
18741874
PowerPC = "powerpc",
18751875
PowerPC64 = "powerpc64",
1876-
PowerPC64LE = "powerpc64le",
18771876
RiscV32 = "riscv32",
18781877
RiscV64 = "riscv64",
18791878
S390x = "s390x",
@@ -1911,7 +1910,6 @@ impl Arch {
19111910
Self::Nvptx64 => sym::nvptx64,
19121911
Self::PowerPC => sym::powerpc,
19131912
Self::PowerPC64 => sym::powerpc64,
1914-
Self::PowerPC64LE => sym::powerpc64le,
19151913
Self::RiscV32 => sym::riscv32,
19161914
Self::RiscV64 => sym::riscv64,
19171915
Self::S390x => sym::s390x,
@@ -1940,8 +1938,8 @@ impl Arch {
19401938

19411939
AArch64 | AmdGpu | Arm | Arm64EC | Avr | CSky | Hexagon | LoongArch32 | LoongArch64
19421940
| M68k | Mips | Mips32r6 | Mips64 | Mips64r6 | Msp430 | Nvptx64 | PowerPC
1943-
| PowerPC64 | PowerPC64LE | RiscV32 | RiscV64 | S390x | Sparc | Sparc64 | Wasm32
1944-
| Wasm64 | X86 | X86_64 | Xtensa => true,
1941+
| PowerPC64 | RiscV32 | RiscV64 | S390x | Sparc | Sparc64 | Wasm32 | Wasm64 | X86
1942+
| X86_64 | Xtensa => true,
19451943
}
19461944
}
19471945
}
@@ -3445,7 +3443,6 @@ impl Target {
34453443
Arch::Arm64EC => (Architecture::Aarch64, Some(object::SubArchitecture::Arm64EC)),
34463444
Arch::AmdGpu
34473445
| Arch::Nvptx64
3448-
| Arch::PowerPC64LE
34493446
| Arch::SpirV
34503447
| Arch::Wasm32
34513448
| Arch::Wasm64

‎compiler/rustc_target/src/target_features.rs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,6 @@ impl Target {
986986
Arch::AmdGpu
987987
| Arch::Avr
988988
| Arch::Msp430
989-
| Arch::PowerPC64LE
990989
| Arch::SpirV
991990
| Arch::Xtensa
992991
| Arch::Other(_) => &[],
@@ -1015,12 +1014,7 @@ impl Target {
10151014
Arch::CSky => CSKY_FEATURES_FOR_CORRECT_FIXED_LENGTH_VECTOR_ABI,
10161015
// FIXME: for some tier3 targets, we are overly cautious and always give warnings
10171016
// when passing args in vector registers.
1018-
Arch::Avr
1019-
| Arch::Msp430
1020-
| Arch::PowerPC64LE
1021-
| Arch::SpirV
1022-
| Arch::Xtensa
1023-
| Arch::Other(_) => &[],
1017+
Arch::Avr | Arch::Msp430 | Arch::SpirV | Arch::Xtensa | Arch::Other(_) => &[],
10241018
}
10251019
}
10261020

‎src/tools/miri/src/shims/alloc.rs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ pub trait EvalContextExt<'tcx>: crate::MiriInterpCxExt<'tcx> {
5252
| Arch::Bpf
5353
| Arch::Msp430
5454
| Arch::Nvptx64
55-
| Arch::PowerPC64LE
5655
| Arch::SpirV
5756
| Arch::Other(_)) => bug!("unsupported target architecture for malloc: `{arch}`"),
5857
};

0 commit comments

Comments
 (0)