summaryrefslogtreecommitdiff
path: root/src/host/library.zig
diff options
context:
space:
mode:
Diffstat (limited to 'src/host/library.zig')
-rw-r--r--src/host/library.zig55
1 files changed, 54 insertions, 1 deletions
diff --git a/src/host/library.zig b/src/host/library.zig
index 91b2296..6516704 100644
--- a/src/host/library.zig
+++ b/src/host/library.zig
@@ -48,8 +48,12 @@ pub const Library = struct {
const cwd = std.Io.Dir.cwd();
const file = try cwd.openFile(io, source, .{});
defer file.close(io);
+ const fixed = try withoutVersym(file.handle);
+ defer if (fixed) |fd| {
+ _ = linux.close(fd);
+ };
var target_buf: [32]u8 = undefined;
- const target = try std.mem.print(&target_buf, "/proc/self/fd/{d}", .{file.handle});
+ const target = try std.mem.print(&target_buf, "/proc/self/fd/{d}", .{fixed orelse file.handle});
var buf: [std.fs.max_path_bytes]u8 = undefined;
const link = try std.mem.printSentinel(&buf, "{s}/sketchbook-{d}-{d}.so", .{ scratch_dir, linux.getpid(), serial }, 0);
try cwd.symLink(io, target, link, .{});
@@ -62,6 +66,55 @@ pub const Library = struct {
}
};
+// ponytail: Zig 0.17.1's new ELF linker (which `-fincremental` selects)
+// writes DT_VERSYM without DT_VERDEF or DT_VERNEED when nothing is
+// versioned, and glibc's dlopen then reads a null version table and
+// faults. Such a library has nothing versioned, so a copy without
+// DT_VERSYM, in an anonymous memory file, loads instead (the build's own
+// file is never written: the watch would see the write). Never fires on a
+// correct library; dead once Zig has commit 6d27011edb (0.18): delete it.
+fn withoutVersym(fd: i32) !?i32 {
+ const elf = std.elf;
+ var ehdr: elf.Elf64.Ehdr = undefined;
+ try pread(fd, std.mem.asBytes(&ehdr), 0);
+ if (!std.mem.eql(u8, &ehdr.ident.magic, elf.MAGIC) or ehdr.ident.class != .@"64" or ehdr.phnum > 32) return null;
+ var phdrs: [32]elf.Elf64.Phdr = undefined;
+ try pread(fd, std.mem.sliceAsBytes(phdrs[0..ehdr.phnum]), ehdr.phoff);
+ for (phdrs[0..ehdr.phnum]) |ph| {
+ if (ph.type != .DYNAMIC) continue;
+ var dyn: [64]elf.Elf64_Dyn = undefined;
+ const len = @min(dyn.len, ph.filesz / @sizeOf(elf.Elf64_Dyn));
+ try pread(fd, std.mem.sliceAsBytes(dyn[0..len]), ph.offset);
+ var versym: ?usize = null;
+ var end: usize = 0;
+ while (end < len and dyn[end].d_tag != elf.DT_NULL) : (end += 1) switch (dyn[end].d_tag) {
+ elf.DT_VERSYM => versym = end,
+ elf.DT_VERDEF, elf.DT_VERNEED => return null,
+ else => {},
+ };
+ const at = versym orelse return null;
+ if (end == len) return null;
+ const copy: i32 = @intCast(@as(isize, @bitCast(linux.memfd_create("sketchbook", linux.MFD.CLOEXEC))));
+ if (copy < 0) return error.MemfdFailed;
+ errdefer _ = linux.close(copy);
+ var offset: i64 = 0;
+ while (true) {
+ const rc = linux.sendfile(copy, fd, &offset, 1 << 30);
+ if (linux.errno(rc) != .SUCCESS) return error.CopyFailed;
+ if (rc == 0) break;
+ }
+ std.mem.copyForwards(elf.Elf64_Dyn, dyn[at..end], dyn[at + 1 .. end + 1]);
+ const bytes = std.mem.sliceAsBytes(dyn[at..end]);
+ if (linux.pwrite(copy, bytes.ptr, bytes.len, @intCast(ph.offset + at * @sizeOf(elf.Elf64_Dyn))) != bytes.len) return error.WriteFailed;
+ return copy;
+ }
+ return null;
+}
+
+fn pread(fd: i32, buf: []u8, offset: u64) !void {
+ if (linux.pread(fd, buf.ptr, buf.len, @intCast(offset)) != buf.len) return error.ShortRead;
+}
+
/// inotify on a library's directory, filtered to its file name. Builds
/// replace files by renaming (`MOVED_TO`) or rewrite them (`CLOSE_WRITE`).
pub const Watch = struct {