diff --git a/lib/std/zig/target.zig b/lib/std/zig/target.zig index 463d854c8489d419f68a75050466a9e0224a6470..94b31b4bb3b415150da66032f0529d2a95e4f269 100644 --- a/lib/std/zig/target.zig +++ b/lib/std/zig/target.zig @@ -76,8 +76,6 @@ pub const available_libcs = [_]ArchOsAbi{ .{ .arch = .mips64el, .os = .linux, .abi = .muslabi64, .os_ver = .{ .major = 2, .minor = 3, .patch = 48 } }, .{ .arch = .mips64el, .os = .linux, .abi = .muslabin32, .os_ver = .{ .major = 2, .minor = 6, .patch = 0 } }, .{ .arch = .mips64el, .os = .openbsd, .abi = .none, .os_ver = .{ .major = 4, .minor = 7, .patch = 0 } }, - .{ .arch = .powerpc, .os = .linux, .abi = .gnueabi, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 }, .glibc_triple = "powerpc-linux-gnu-soft" }, - .{ .arch = .powerpc, .os = .linux, .abi = .gnueabihf, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 }, .glibc_triple = "powerpc-linux-gnu" }, .{ .arch = .powerpc, .os = .linux, .abi = .musleabi, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 } }, .{ .arch = .powerpc, .os = .linux, .abi = .musleabihf, .os_ver = .{ .major = 1, .minor = 3, .patch = 45 } }, .{ .arch = .powerpc, .os = .netbsd, .abi = .eabi, .os_ver = .{ .major = 6, .minor = 0, .patch = 0 } }, @@ -244,7 +242,7 @@ pub fn glibcArchNameHeaders(arch: std.Target.Cpu.Arch) [:0]const u8 { .arm, .armeb => "arm", .loongarch64 => "loongarch", .mips, .mipsel, .mips64, .mips64el => "mips", - .powerpc, .powerpc64le => "powerpc", + .powerpc64le => "powerpc", .riscv32, .riscv64 => "riscv", .sparc, .sparc64 => "sparc", .x86, .x86_64 => "x86", diff --git a/test/llvm_targets.zig b/test/llvm_targets.zig index 7dba86fae797a41e1c48b2d915f72af43fb07263..c043e7f45b1eb08bbfcd5a8e96f6cbea5f6525a2 100644 --- a/test/llvm_targets.zig +++ b/test/llvm_targets.zig @@ -190,8 +190,6 @@ const targets = [_]std.Target.Query{ .{ .cpu_arch = .powerpc, .os_tag = .haiku, .abi = .eabihf }, .{ .cpu_arch = .powerpc, .os_tag = .linux, .abi = .eabi }, .{ .cpu_arch = .powerpc, .os_tag = .linux, .abi = .eabihf }, - .{ .cpu_arch = .powerpc, .os_tag = .linux, .abi = .gnueabi }, - .{ .cpu_arch = .powerpc, .os_tag = .linux, .abi = .gnueabihf }, .{ .cpu_arch = .powerpc, .os_tag = .linux, .abi = .musleabi }, .{ .cpu_arch = .powerpc, .os_tag = .linux, .abi = .musleabihf }, .{ .cpu_arch = .powerpc, .os_tag = .netbsd, .abi = .eabi }, diff --git a/test/tests.zig b/test/tests.zig index e5d43aa9101cc5d08cd126db49e22c02fc294462..279271af97c407d5ad8ded27a74223d9107489de 100644 --- a/test/tests.zig +++ b/test/tests.zig @@ -792,25 +792,6 @@ const module_test_targets = blk: { .skip_modules = &.{"std"}, .extra_target = true, }, - .{ - .target = .{ - .cpu_arch = .powerpc, - .os_tag = .linux, - .abi = .gnueabi, - }, - .link_libc = true, - .extra_target = true, - }, - .{ - .target = .{ - .cpu_arch = .powerpc, - .os_tag = .linux, - .abi = .gnueabihf, - }, - .link_libc = true, - // https://github.com/ziglang/zig/issues/2256 - .skip_modules = &.{"std"}, - }, .{ .target = .{ diff --git a/tools/process_headers.zig b/tools/process_headers.zig index 80e30c46833e395353787cec50ed45ae35bf0fef..b38d0c1d1cb90e6b18431897b9eae84619a26126 100644 --- a/tools/process_headers.zig +++ b/tools/process_headers.zig @@ -47,8 +47,6 @@ const glibc_targets = [_]LibCTarget{ .{ .arch = .mips64, .abi = .gnuabin32, .dest = "mips-linux-gnu" }, .{ .arch = .mips64el, .abi = .gnuabi64, .dest = "mips-linux-gnu" }, .{ .arch = .mips64el, .abi = .gnuabin32, .dest = "mips-linux-gnu" }, - .{ .arch = .powerpc, .abi = .gnueabi, .dest = "powerpc-linux-gnu" }, - .{ .arch = .powerpc, .abi = .gnueabihf, .dest = "powerpc-linux-gnu" }, .{ .arch = .powerpc64le, .abi = .gnu, .dest = "powerpc-linux-gnu" }, .{ .arch = .riscv32, .abi = .gnu, .dest = "riscv-linux-gnu" }, .{ .arch = .riscv64, .abi = .gnu, .dest = "riscv-linux-gnu" },