authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2024-08-30 14:35:30-07:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2024-08-30 14:35:30-07:00
log5d08b7f0548c61b918504a7b02573127c49c6f97
tree63cf6473f8312e79717c4f0ffb034411561c1720
parenta4cc43c42b5e139276190dc426aa5ecb3564c52d
parent694004ed404ea7d076a0a270c793099f1206e2af
signaturebadge-check Signed by PGP key B5690EEEBB952194

Merge pull request #21178 from alexrp/glibc-thumb

`std.zig.target`: Remove `thumb*-linux-gnueabi*` target triples.

2 files changed, 3 insertions(+), 7 deletions(-)

lib/std/zig/target.zig-4
...@@ -24,12 +24,8 @@ pub const available_libcs = [_]ArchOsAbi{...@@ -24,12 +24,8 @@ pub const available_libcs = [_]ArchOsAbi{
24 .{ .arch = .arm, .os = .linux, .abi = .gnueabihf },24 .{ .arch = .arm, .os = .linux, .abi = .gnueabihf },
25 .{ .arch = .arm, .os = .linux, .abi = .musleabi },25 .{ .arch = .arm, .os = .linux, .abi = .musleabi },
26 .{ .arch = .arm, .os = .linux, .abi = .musleabihf },26 .{ .arch = .arm, .os = .linux, .abi = .musleabihf },
27 .{ .arch = .thumb, .os = .linux, .abi = .gnueabi },
28 .{ .arch = .thumb, .os = .linux, .abi = .gnueabihf },
29 .{ .arch = .thumb, .os = .linux, .abi = .musleabi },27 .{ .arch = .thumb, .os = .linux, .abi = .musleabi },
30 .{ .arch = .thumb, .os = .linux, .abi = .musleabihf },28 .{ .arch = .thumb, .os = .linux, .abi = .musleabihf },
31 .{ .arch = .thumbeb, .os = .linux, .abi = .gnueabi },
32 .{ .arch = .thumbeb, .os = .linux, .abi = .gnueabihf },
33 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabi },29 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabi },
34 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabihf },30 .{ .arch = .thumbeb, .os = .linux, .abi = .musleabihf },
35 .{ .arch = .thumb, .os = .windows, .abi = .gnu },31 .{ .arch = .thumb, .os = .windows, .abi = .gnu },
src/glibc.zig+3-3
...@@ -156,7 +156,7 @@ pub fn loadMetaData(gpa: Allocator, contents: []const u8) LoadMetaDataError!*ABI...@@ -156,7 +156,7 @@ pub fn loadMetaData(gpa: Allocator, contents: []const u8) LoadMetaDataError!*ABI
156fn useElfInitFini(target: std.Target) bool {156fn useElfInitFini(target: std.Target) bool {
157 // Legacy architectures use _init/_fini.157 // Legacy architectures use _init/_fini.
158 return switch (target.cpu.arch) {158 return switch (target.cpu.arch) {
159 .arm, .armeb, .thumb, .thumbeb => true,159 .arm, .armeb => true,
160 .aarch64, .aarch64_be => true,160 .aarch64, .aarch64_be => true,
161 .m68k => true,161 .m68k => true,
162 .mips, .mipsel, .mips64, .mips64el => true,162 .mips, .mipsel, .mips64, .mips64el => true,
...@@ -435,7 +435,7 @@ fn start_asm_path(comp: *Compilation, arena: Allocator, basename: []const u8) ![...@@ -435,7 +435,7 @@ fn start_asm_path(comp: *Compilation, arena: Allocator, basename: []const u8) ![
435 try result.appendSlice("sparc" ++ s ++ "sparc32");435 try result.appendSlice("sparc" ++ s ++ "sparc32");
436 }436 }
437 }437 }
438 } else if (arch.isArmOrThumb()) {438 } else if (arch.isARM()) {
439 try result.appendSlice("arm");439 try result.appendSlice("arm");
440 } else if (arch.isMIPS()) {440 } else if (arch.isMIPS()) {
441 if (!mem.eql(u8, basename, "crti.S") and !mem.eql(u8, basename, "crtn.S")) {441 if (!mem.eql(u8, basename, "crti.S") and !mem.eql(u8, basename, "crtn.S")) {
...@@ -587,7 +587,7 @@ fn add_include_dirs_arch(...@@ -587,7 +587,7 @@ fn add_include_dirs_arch(
587 try args.append("-I");587 try args.append("-I");
588 try args.append(try path.join(arena, &[_][]const u8{ dir, "x86" }));588 try args.append(try path.join(arena, &[_][]const u8{ dir, "x86" }));
589 }589 }
590 } else if (arch.isArmOrThumb()) {590 } else if (arch.isARM()) {
591 if (opt_nptl) |nptl| {591 if (opt_nptl) |nptl| {
592 try args.append("-I");592 try args.append("-I");
593 try args.append(try path.join(arena, &[_][]const u8{ dir, "arm", nptl }));593 try args.append(try path.join(arena, &[_][]const u8{ dir, "arm", nptl }));