Commit `ba7f40c430`

Andrew Kelley <andrew@ziglang.org>

2021-09-30 00:37:34

stage2: fix ELF linking to include compiler_rt

There was duplicated logic for whether to include compiler_rt in the linker line both in the frontend and in the linker backends. Now the logic is only in the frontend; the linker puts it on the linker line if the frontend provides it. Fixes the CI failures.

master

1 parent bdbedff

Changed files (1)

src

link

Elf.zig

@@ -1282,20 +1282,11 @@ fn linkWithLLD(self: *Elf, comp: *Compilation) !void {
     const gc_sections = self.base.options.gc_sections orelse !is_obj;
     const stack_size = self.base.options.stack_size_override orelse 16777216;
     const allow_shlib_undefined = self.base.options.allow_shlib_undefined orelse !self.base.options.is_native_os;
-    const compiler_rt_path: ?[]const u8 = if (self.base.options.include_compiler_rt) blk: {
-        // TODO: remove when stage2 can build compiler_rt.zig
-        if (!self.base.options.use_llvm) break :blk null;
-
-        // In the case of build-obj we include the compiler-rt symbols directly alongside
-        // the symbols of the root source file, in the same compilation unit.
-        if (is_obj) break :blk null;
-
-        if (is_exe_or_dyn_lib) {
-            break :blk comp.compiler_rt_static_lib.?.full_object_path;
-        } else {
-            break :blk comp.compiler_rt_obj.?.full_object_path;
-        }
-    } else null;
+    const compiler_rt_path: ?[]const u8 = blk: {
+        if (comp.compiler_rt_static_lib) |x| break :blk x.full_object_path;
+        if (comp.compiler_rt_obj) |x| break :blk x.full_object_path;
+        break :blk null;
+    };
 
     // Here we want to determine whether we can save time by not invoking LLD when the
     // output is unchanged. None of the linker options or the object files that are being

Commit ba7f40c430

Commit `ba7f40c430`