zig

commit d7deffee8d1861720ba4f9d3cb6a7f6dfb7ccb33 (tree)
parent 0e6d2184cacf2dd1fad7508b2f9ae99d78763148
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Fri, 28 Jan 2022 12:18:53 -0700

link: ELF, COFF, WASM: honor the "must_link" flag of positionals

Previously only the MachO linker was honoring the flag.

Diffstat:
M
src/link/Coff.zig
 | 
6
+++++-
M
src/link/Elf.zig
 | 
15
+++++++++++++--
M
src/link/Wasm.zig
 | 
15
+++++++++++++--

3 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/src/link/Coff.zig b/src/link/Coff.zig
@@ -1121,7 +1121,11 @@ fn linkWithLLD(self: *Coff, comp: *Compilation) !void {
 
         try argv.ensureUnusedCapacity(self.base.options.objects.len);
         for (self.base.options.objects) |obj| {
-            argv.appendAssumeCapacity(obj.path);
+            if (obj.must_link) {
+                argv.appendAssumeCapacity(try allocPrint(arena, "-WHOLEARCHIVE:{s}", .{obj.path}));
+            } else {
+                argv.appendAssumeCapacity(obj.path);
+            }
         }
 
         for (comp.c_object_table.keys()) |key| {
diff --git a/src/link/Elf.zig b/src/link/Elf.zig
@@ -1732,9 +1732,20 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
         }
 
         // Positional arguments to the linker such as object files.
-        try argv.ensureUnusedCapacity(self.base.options.objects.len);
+        var whole_archive = false;
         for (self.base.options.objects) |obj| {
-            argv.appendAssumeCapacity(obj.path);
+            if (obj.must_link and !whole_archive) {
+                try argv.append("-whole-archive");
+                whole_archive = true;
+            } else if (!obj.must_link and whole_archive) {
+                try argv.append("-no-whole-archive");
+                whole_archive = false;
+            }
+            try argv.append(obj.path);
+        }
+        if (whole_archive) {
+            try argv.append("-no-whole-archive");
+            whole_archive = false;
         }
 
         for (comp.c_object_table.keys()) |key| {
diff --git a/src/link/Wasm.zig b/src/link/Wasm.zig
@@ -1437,9 +1437,20 @@ fn linkWithLLD(self: *Wasm, comp: *Compilation) !void {
         }
 
         // Positional arguments to the linker such as object files.
-        try argv.ensureUnusedCapacity(self.base.options.objects.len);
+        var whole_archive = false;
         for (self.base.options.objects) |obj| {
-            argv.appendAssumeCapacity(obj.path);
+            if (obj.must_link and !whole_archive) {
+                try argv.append("-whole-archive");
+                whole_archive = true;
+            } else if (!obj.must_link and whole_archive) {
+                try argv.append("-no-whole-archive");
+                whole_archive = false;
+            }
+            try argv.append(obj.path);
+        }
+        if (whole_archive) {
+            try argv.append("-no-whole-archive");
+            whole_archive = false;
         }
 
         for (comp.c_object_table.keys()) |key| {