motiejus/zig
1
Fork 0
Code Releases Activity

Merge pull request #16098 from ziglang/musl-v1.2.4

Browse Source 
update musl from v1.2.3 to v1.2.4
This commit is contained in:
jacobly0
2023-06-20 23:14:22 -04:00
committed by GitHub
parent 8875efe548 09c7f1bd7c
commit e2eabbbc51
223 changed files with 1121 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Compilation.zig
View File

@@ -4918,7 +4918,7 @@ fn detectLibCFromBuilding(
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.archName(target.cpu.arch)
musl.archNameHeaders(target.cpu.arch)
else if (target.cpu.arch.isThumb())
// ARM headers are valid for Thumb too.
switch (target.cpu.arch) {

18
src/musl.zig
View File

@@ -258,7 +258,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
}
}
pub fn archName(arch: std.Target.Cpu.Arch) [:0]const u8 {
fn archName(arch: std.Target.Cpu.Arch) [:0]const u8 {
switch (arch) {
.aarch64, .aarch64_be => return "aarch64",
.arm, .armeb, .thumb, .thumbeb => return "arm",
@@ -275,6 +275,13 @@ pub fn archName(arch: std.Target.Cpu.Arch) [:0]const u8 {
}
}
pub fn archNameHeaders(arch: std.Target.Cpu.Arch) [:0]const u8 {
return switch (arch) {
.x86 => return "x86",
else => archName(arch),
};
}
// Return true if musl has arch-specific crti/crtn sources.
// See lib/libc/musl/crt/ARCH/crt?.s .
pub fn needsCrtiCrtn(target: std.Target) bool {
@@ -361,7 +368,9 @@ fn addCcArgs(
const target = comp.getTarget();
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 triple = try std.fmt.allocPrint(arena, "{s}-{s}-musl", .{
archNameHeaders(target.cpu.arch), os_name,
});
const o_arg = if (want_O3) "-O3" else "-Os";
try args.appendSlice(&[_][]const u8{
@@ -1457,6 +1466,7 @@ const src_files = [_][]const u8{
"musl/src/prng/seed48.c",
"musl/src/prng/srand48.c",
"musl/src/process/_Fork.c",
"musl/src/process/aarch64/vfork.s",
"musl/src/process/arm/vfork.s",
"musl/src/process/execl.c",
"musl/src/process/execle.c",
@@ -1487,6 +1497,7 @@ const src_files = [_][]const u8{
"musl/src/process/posix_spawnattr_setsigdefault.c",
"musl/src/process/posix_spawnattr_setsigmask.c",
"musl/src/process/posix_spawnp.c",
"musl/src/process/riscv64/vfork.s",
"musl/src/process/s390x/vfork.s",
"musl/src/process/sh/vfork.s",
"musl/src/process/system.c",
@@ -1570,11 +1581,8 @@ const src_files = [_][]const u8{
"musl/src/signal/m68k/sigsetjmp.s",
"musl/src/signal/microblaze/restore.s",
"musl/src/signal/microblaze/sigsetjmp.s",
"musl/src/signal/mips/restore.s",
"musl/src/signal/mips/sigsetjmp.s",
"musl/src/signal/mips64/restore.s",
"musl/src/signal/mips64/sigsetjmp.s",
"musl/src/signal/mipsn32/restore.s",
"musl/src/signal/mipsn32/sigsetjmp.s",
"musl/src/signal/or1k/sigsetjmp.s",
"musl/src/signal/powerpc/restore.s",

2
src/wasi_libc.zig
View File

@@ -256,7 +256,7 @@ fn addCCArgs(
want_O3: bool,
) error{OutOfMemory}!void {
const target = comp.getTarget();
const arch_name = musl.archName(target.cpu.arch);
const arch_name = musl.archNameHeaders(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";