From 694004ed404ea7d076a0a270c793099f1206e2af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Thu, 22 Aug 2024 22:48:51 +0200 Subject: [PATCH] glibc: Remove mentions of thumb. We no longer expose `thumb*-linux-gnueabi*` target triples in std.zig.target. --- src/glibc.zig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/glibc.zig b/src/glibc.zig index 4689805391..94c180f3d4 100644 --- a/src/glibc.zig +++ b/src/glibc.zig @@ -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 }));