diff --git a/src/Compilation.zig b/src/Compilation.zig index b96d30c204..b5daf860eb 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -3180,7 +3180,7 @@ fn detectLibCIncludeDirs( const generic_name = target_util.libCGenericName(target); // Some architectures are handled by the same set of headers. const arch_name = if (target.abi.isMusl()) - musl.archMuslName(target.cpu.arch) + musl.archName(target.cpu.arch) else if (target.cpu.arch.isThumb()) // ARM headers are valid for Thumb too. switch (target.cpu.arch) { diff --git a/src/musl.zig b/src/musl.zig index e2f1509d3f..5049dbb371 100644 --- a/src/musl.zig +++ b/src/musl.zig @@ -108,7 +108,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { // When there is a src//foo.* then it should substitute for src/foo.* // Even a .s file can substitute for a .c file. const target = comp.getTarget(); - const arch_name = archMuslName(target.cpu.arch); + const arch_name = archName(target.cpu.arch); var source_table = std.StringArrayHashMap(Ext).init(comp.gpa); defer source_table.deinit(); @@ -248,7 +248,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void { } } -pub fn archMuslName(arch: std.Target.Cpu.Arch) [:0]const u8 { +pub fn archName(arch: std.Target.Cpu.Arch) [:0]const u8 { switch (arch) { .aarch64, .aarch64_be => return "aarch64", .arm, .armeb, .thumb, .thumbeb => return "arm", @@ -350,7 +350,7 @@ fn addCcArgs( want_O3: bool, ) error{OutOfMemory}!void { const target = comp.getTarget(); - const arch_name = archMuslName(target.cpu.arch); + const arch_name = archName(target.cpu.arch); const os_name = @tagName(target.os.tag); const triple = try std.fmt.allocPrint(arena, "{s}-{s}-musl", .{ arch_name, os_name }); const o_arg = if (want_O3) "-O3" else "-Os"; @@ -398,7 +398,7 @@ fn addCcArgs( fn start_asm_path(comp: *Compilation, arena: *Allocator, basename: []const u8) ![]const u8 { const target = comp.getTarget(); return comp.zig_lib_directory.join(arena, &[_][]const u8{ - "libc", "musl", "crt", archMuslName(target.cpu.arch), basename, + "libc", "musl", "crt", archName(target.cpu.arch), basename, }); } diff --git a/src/wasi_libc.zig b/src/wasi_libc.zig index 80b8904fa6..3c04203082 100644 --- a/src/wasi_libc.zig +++ b/src/wasi_libc.zig @@ -5,6 +5,7 @@ const Allocator = std.mem.Allocator; const Compilation = @import("Compilation.zig"); const build_options = @import("build_options"); const target_util = @import("target.zig"); +const musl = @import("musl.zig"); pub fn buildWasiLibcSysroot(comp: *Compilation) !void { if (!build_options.have_llvm) { @@ -226,7 +227,7 @@ fn addCCArgs( want_O3: bool, ) error{OutOfMemory}!void { const target = comp.getTarget(); - const arch_name = target_util.archMuslName(target.cpu.arch); + const arch_name = musl.archName(target.cpu.arch); const os_name = @tagName(target.os.tag); const triple = try std.fmt.allocPrint(arena, "{s}-{s}-musl", .{ arch_name, os_name }); const o_arg = if (want_O3) "-O3" else "-Os";