aboutsummaryrefslogtreecommitdiff
path: root/src/glibc.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2023-12-16 15:22:31 -0700
committerAndrew Kelley <andrew@ziglang.org>2024-01-01 17:51:20 -0700
commitf2564318385ea90b08af044ae32ddef26e6346bd (patch)
treeacb36d3268bace51f780a872f40b04da092591de /src/glibc.zig
parent57afdfc8fae667e69850650ebb8606805d0d2272 (diff)
downloadzig-f2564318385ea90b08af044ae32ddef26e6346bd.tar.gz
zig-f2564318385ea90b08af044ae32ddef26e6346bd.zip
fix compilation errors when enabling llvm
Diffstat (limited to 'src/glibc.zig')
-rw-r--r--src/glibc.zig23
1 files changed, 15 insertions, 8 deletions
diff --git a/src/glibc.zig b/src/glibc.zig
index 0502bc3799..d478c6e939 100644
--- a/src/glibc.zig
+++ b/src/glibc.zig
@@ -170,7 +170,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
defer arena_allocator.deinit();
const arena = arena_allocator.allocator();
- const target = comp.getTarget();
+ const target = comp.root_mod.resolved_target.result;
const target_ver = target.os.version_range.linux.glibc;
const start_old_init_fini = target_ver.order(.{ .major = 2, .minor = 33, .patch = 0 }) != .gt;
@@ -196,12 +196,14 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
"-DASSEMBLER",
"-Wa,--noexecstack",
});
- return comp.build_crt_file("crti", .Obj, .@"glibc crti.o", prog_node, &.{
+ var files = [_]Compilation.CSourceFile{
.{
.src_path = try start_asm_path(comp, arena, "crti.S"),
.cache_exempt_flags = args.items,
+ .owner = comp.root_mod,
},
- });
+ };
+ return comp.build_crt_file("crti", .Obj, .@"glibc crti.o", prog_node, &files);
},
.crtn_o => {
var args = std.ArrayList([]const u8).init(arena);
@@ -215,12 +217,14 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
"-DASSEMBLER",
"-Wa,--noexecstack",
});
- return comp.build_crt_file("crtn", .Obj, .@"glibc crtn.o", prog_node, &.{
+ var files = [_]Compilation.CSourceFile{
.{
.src_path = try start_asm_path(comp, arena, "crtn.S"),
.cache_exempt_flags = args.items,
+ .owner = undefined,
},
- });
+ };
+ return comp.build_crt_file("crtn", .Obj, .@"glibc crtn.o", prog_node, &files);
},
.scrt1_o => {
const start_o: Compilation.CSourceFile = blk: {
@@ -244,6 +248,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
break :blk .{
.src_path = try start_asm_path(comp, arena, src_path),
.cache_exempt_flags = args.items,
+ .owner = undefined,
};
};
const abi_note_o: Compilation.CSourceFile = blk: {
@@ -263,11 +268,11 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
break :blk .{
.src_path = try lib_path(comp, arena, lib_libc_glibc ++ "csu" ++ path.sep_str ++ "abi-note.S"),
.cache_exempt_flags = args.items,
+ .owner = undefined,
};
};
- return comp.build_crt_file("Scrt1", .Obj, .@"glibc Scrt1.o", prog_node, &.{
- start_o, abi_note_o,
- });
+ var files = [_]Compilation.CSourceFile{ start_o, abi_note_o };
+ return comp.build_crt_file("Scrt1", .Obj, .@"glibc Scrt1.o", prog_node, &files);
},
.libc_nonshared_a => {
const s = path.sep_str;
@@ -364,6 +369,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile, prog_node: *std.Progr
files_buf[files_index] = .{
.src_path = try lib_path(comp, arena, dep.path),
.cache_exempt_flags = args.items,
+ .owner = undefined,
};
files_index += 1;
}
@@ -1065,6 +1071,7 @@ fn buildSharedLib(
const c_source_files = [1]Compilation.CSourceFile{
.{
.src_path = try path.join(arena, &[_][]const u8{ bin_directory.path.?, asm_file_basename }),
+ .owner = undefined,
},
};