zig

commit b63c92f0b9ce7b3876c5f51e12a6ae249dfa4bac (tree)
parent 3a5d0f7700dc28b523e17ba461874b807786b939
Author: Jakub Konka <kubkon@jakubkonka.com>
Date:   Thu, 20 May 2021 14:08:28 +0200

cc,wasi: do not add stack protector

Diffstat:
M
src/Compilation.zig
 | 
4
++--
M
src/wasi_libc.zig
 | 
1
+

2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/Compilation.zig b/src/Compilation.zig
@@ -2896,7 +2896,7 @@ pub fn addCCArgs(
                     try argv.append("-D_DEBUG");
                     try argv.append("-Og");
 
-                    if (comp.bin_file.options.link_libc) {
+                    if (comp.bin_file.options.link_libc and target.os.tag != .wasi) {
                         try argv.append("-fstack-protector-strong");
                         try argv.append("--param");
                         try argv.append("ssp-buffer-size=4");
@@ -2908,7 +2908,7 @@ pub fn addCCArgs(
                     // See the comment in the BuildModeFastRelease case for why we pass -O2 rather
                     // than -O3 here.
                     try argv.append("-O2");
-                    if (comp.bin_file.options.link_libc) {
+                    if (comp.bin_file.options.link_libc and target.os.tag != .wasi) {
                         try argv.append("-D_FORTIFY_SOURCE=2");
                         try argv.append("-fstack-protector-strong");
                         try argv.append("--param");
diff --git a/src/wasi_libc.zig b/src/wasi_libc.zig
@@ -234,6 +234,7 @@ fn addCCArgs(
     try args.appendSlice(&[_][]const u8{
         "-std=gnu17",
         "-fno-trapping-math",
+        "-fno-stack-protector",
         "-w", // ignore all warnings
 
         o_arg,