1 files changed, 21 insertions, 28 deletions

diff --git a/src/link/Goff.zig b/src/link/Goff.zig
index 6ed360be25..1f4a7a4d30 100644
--- a/src/link/Goff.zig
+++ b/src/link/Goff.zig
@@ -13,14 +13,12 @@ const Path = std.Build.Cache.Path;
 const Zcu = @import("../Zcu.zig");
 const InternPool = @import("../InternPool.zig");
 const Compilation = @import("../Compilation.zig");
+const codegen = @import("../codegen.zig");
 const link = @import("../link.zig");
 const trace = @import("../tracy.zig").trace;
 const build_options = @import("build_options");
-const Air = @import("../Air.zig");
-const LlvmObject = @import("../codegen/llvm.zig").Object;
 
 base: link.File,
-llvm_object: LlvmObject.Ptr,
 
 pub fn createEmpty(
     arena: Allocator,
@@ -36,23 +34,20 @@ pub fn createEmpty(
     assert(!use_lld); // Caught by Compilation.Config.resolve.
     assert(target.os.tag == .zos); // Caught by Compilation.Config.resolve.
 
-    const llvm_object = try LlvmObject.create(arena, comp);
     const goff = try arena.create(Goff);
     goff.* = .{
         .base = .{
             .tag = .goff,
             .comp = comp,
             .emit = emit,
-            .zcu_object_sub_path = emit.sub_path,
+            .zcu_object_basename = emit.sub_path,
             .gc_sections = options.gc_sections orelse false,
             .print_gc_sections = options.print_gc_sections,
             .stack_size = options.stack_size orelse 0,
             .allow_shlib_undefined = options.allow_shlib_undefined orelse false,
             .file = null,
-            .disable_lld_caching = options.disable_lld_caching,
             .build_id = options.build_id,
         },
-        .llvm_object = llvm_object,
     };
 
     return goff;
@@ -70,27 +65,27 @@ pub fn open(
 }
 
 pub fn deinit(self: *Goff) void {
-    self.llvm_object.deinit();
+    _ = self;
 }
 
 pub fn updateFunc(
     self: *Goff,
     pt: Zcu.PerThread,
     func_index: InternPool.Index,
-    air: Air,
-    liveness: Air.Liveness,
+    mir: *const codegen.AnyMir,
 ) link.File.UpdateNavError!void {
-    if (build_options.skip_non_native and builtin.object_format != .goff)
-        @panic("Attempted to compile for object format that was disabled by build configuration");
-
-    try self.llvm_object.updateFunc(pt, func_index, air, liveness);
+    _ = self;
+    _ = pt;
+    _ = func_index;
+    _ = mir;
+    unreachable; // we always use llvm
 }
 
 pub fn updateNav(self: *Goff, pt: Zcu.PerThread, nav: InternPool.Nav.Index) link.File.UpdateNavError!void {
-    if (build_options.skip_non_native and builtin.object_format != .goff)
-        @panic("Attempted to compile for object format that was disabled by build configuration");
-
-    return self.llvm_object.updateNav(pt, nav);
+    _ = self;
+    _ = pt;
+    _ = nav;
+    unreachable; // we always use llvm
 }
 
 pub fn updateExports(
@@ -99,21 +94,19 @@ pub fn updateExports(
     exported: Zcu.Exported,
     export_indices: []const Zcu.Export.Index,
 ) !void {
-    if (build_options.skip_non_native and builtin.object_format != .goff)
-        @panic("Attempted to compile for object format that was disabled by build configuration");
-
-    return self.llvm_object.updateExports(pt, exported, export_indices);
+    _ = self;
+    _ = pt;
+    _ = exported;
+    _ = export_indices;
+    unreachable; // we always use llvm
 }
 
 pub fn flush(self: *Goff, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: std.Progress.Node) link.File.FlushError!void {
-    return self.flushModule(arena, tid, prog_node);
-}
-
-pub fn flushModule(self: *Goff, arena: Allocator, tid: Zcu.PerThread.Id, prog_node: std.Progress.Node) link.File.FlushError!void {
     if (build_options.skip_non_native and builtin.object_format != .goff)
         @panic("Attempted to compile for object format that was disabled by build configuration");
 
+    _ = self;
+    _ = arena;
     _ = tid;
-
-    try self.base.emitLlvmObject(arena, self.llvm_object, prog_node);
+    _ = prog_node;
 }