authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-08-22 22:48:51+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-08-28 02:57:31+02:00
log694004ed404ea7d076a0a270c793099f1206e2af
tree68bd2b0a2877a29941a05f8d160d3a8f4c9aa7ce
parent281707acf3f796e624e5faf5e338878050909f27

glibc: Remove mentions of thumb.

We no longer expose `thumb*-linux-gnueabi*` target triples in std.zig.target.

1 files changed, 3 insertions(+), 3 deletions(-)

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 }));