motiejus/zig
1
Fork 0
Code Releases Activity

Merge pull request #21178 from alexrp/glibc-thumb

Browse Source 
`std.zig.target`: Remove `thumb*-linux-gnueabi*` target triples.
This commit is contained in:
Andrew Kelley
2024-08-30 14:35:30 -07:00
committed by GitHub
parent a4cc43c42b 694004ed40
commit 5d08b7f054
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/std/zig/target.zig
View File

@@ -24,12 +24,8 @@ pub const available_libcs = [_]ArchOsAbi{
.{ .arch = .arm, .os = .linux, .abi = .gnueabihf },
.{ .arch = .arm, .os = .linux, .abi = .musleabi },
.{ .arch = .arm, .os = .linux, .abi = .musleabihf },
.{ .arch = .thumb, .os = .linux, .abi = .gnueabi },
.{ .arch = .thumb, .os = .linux, .abi = .gnueabihf },
.{ .arch = .thumb, .os = .linux, .abi = .musleabi },
.{ .arch = .thumb, .os = .linux, .abi = .musleabihf },
.{ .arch = .thumbeb, .os = .linux, .abi = .gnueabi },
.{ .arch = .thumbeb, .os = .linux, .abi = .gnueabihf },
.{ .arch = .thumbeb, .os = .linux, .abi = .musleabi },
.{ .arch = .thumbeb, .os = .linux, .abi = .musleabihf },
.{ .arch = .thumb, .os = .windows, .abi = .gnu },

6
src/glibc.zig
View File

@@ -156,7 +156,7 @@ pub fn loadMetaData(gpa: Allocator, contents: []const u8) LoadMetaDataError!*ABI
fn useElfInitFini(target: std.Target) bool {
// Legacy architectures use _init/_fini.
return switch (target.cpu.arch) {
.arm, .armeb, .thumb, .thumbeb => true,
.arm, .armeb => true,
.aarch64, .aarch64_be => true,
.m68k => true,
.mips, .mipsel, .mips64, .mips64el => true,
@@ -435,7 +435,7 @@ fn start_asm_path(comp: *Compilation, arena: Allocator, basename: []const u8) ![
try result.appendSlice("sparc" ++ s ++ "sparc32");
}
}
} else if (arch.isArmOrThumb()) {
} else if (arch.isARM()) {
try result.appendSlice("arm");
} else if (arch.isMIPS()) {
if (!mem.eql(u8, basename, "crti.S") and !mem.eql(u8, basename, "crtn.S")) {
@@ -587,7 +587,7 @@ fn add_include_dirs_arch(
try args.append("-I");
try args.append(try path.join(arena, &[_][]const u8{ dir, "x86" }));
}
} else if (arch.isArmOrThumb()) {
} else if (arch.isARM()) {
if (opt_nptl) |nptl| {
try args.append("-I");
try args.append(try path.join(arena, &[_][]const u8{ dir, "arm", nptl }));