aboutsummaryrefslogtreecommitdiff
path: root/src/link/Elf.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2022-08-19 06:41:34 -0400
committerGitHub <noreply@github.com>2022-08-19 06:41:34 -0400
commitbe2bd5848a880765f4bc7e2363ef201a0930a04b (patch)
tree868694d734e82cb93b52b6c0c155d932f5f65f8f /src/link/Elf.zig
parent2ccaa5414b904edb2f4af293291f5401d106f277 (diff)
parentfdb934a157230ae6d3f11dee8d0d62013d5b919e (diff)
downloadzig-be2bd5848a880765f4bc7e2363ef201a0930a04b.tar.gz
zig-be2bd5848a880765f4bc7e2363ef201a0930a04b.zip
Merge pull request #12472 from ziglang/stage2-stack-protector
stage2: implement stack protectors
Diffstat (limited to 'src/link/Elf.zig')
-rw-r--r--src/link/Elf.zig6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/link/Elf.zig b/src/link/Elf.zig
index 2f67c35205..9902886bac 100644
--- a/src/link/Elf.zig
+++ b/src/link/Elf.zig
@@ -1673,6 +1673,12 @@ fn linkWithLLD(self: *Elf, comp: *Compilation, prog_node: *std.Progress.Node) !v
}
}
+ // stack-protector.
+ // Related: https://github.com/ziglang/zig/issues/7265
+ if (comp.libssp_static_lib) |ssp| {
+ try argv.append(ssp.full_object_path);
+ }
+
// compiler-rt
if (compiler_rt_path) |p| {
try argv.append(p);