authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-05-20 14:08:28+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-05-20 16:54:00+02:00
logb63c92f0b9ce7b3876c5f51e12a6ae249dfa4bac
tree7030b6821267885799a597fa672202af8f21ede8
parent3a5d0f7700dc28b523e17ba461874b807786b939

cc,wasi: do not add stack protector

2 files changed, 3 insertions(+), 2 deletions(-)

src/Compilation.zig+2-2
...@@ -2896,7 +2896,7 @@ pub fn addCCArgs(...@@ -2896,7 +2896,7 @@ pub fn addCCArgs(
2896 try argv.append("-D_DEBUG");2896 try argv.append("-D_DEBUG");
2897 try argv.append("-Og");2897 try argv.append("-Og");
28982898
2899 if (comp.bin_file.options.link_libc) {2899 if (comp.bin_file.options.link_libc and target.os.tag != .wasi) {
2900 try argv.append("-fstack-protector-strong");2900 try argv.append("-fstack-protector-strong");
2901 try argv.append("--param");2901 try argv.append("--param");
2902 try argv.append("ssp-buffer-size=4");2902 try argv.append("ssp-buffer-size=4");
...@@ -2908,7 +2908,7 @@ pub fn addCCArgs(...@@ -2908,7 +2908,7 @@ pub fn addCCArgs(
2908 // See the comment in the BuildModeFastRelease case for why we pass -O2 rather2908 // See the comment in the BuildModeFastRelease case for why we pass -O2 rather
2909 // than -O3 here.2909 // than -O3 here.
2910 try argv.append("-O2");2910 try argv.append("-O2");
2911 if (comp.bin_file.options.link_libc) {2911 if (comp.bin_file.options.link_libc and target.os.tag != .wasi) {
2912 try argv.append("-D_FORTIFY_SOURCE=2");2912 try argv.append("-D_FORTIFY_SOURCE=2");
2913 try argv.append("-fstack-protector-strong");2913 try argv.append("-fstack-protector-strong");
2914 try argv.append("--param");2914 try argv.append("--param");
src/wasi_libc.zig+1
...@@ -234,6 +234,7 @@ fn addCCArgs(...@@ -234,6 +234,7 @@ fn addCCArgs(
234 try args.appendSlice(&[_][]const u8{234 try args.appendSlice(&[_][]const u8{
235 "-std=gnu17",235 "-std=gnu17",
236 "-fno-trapping-math",236 "-fno-trapping-math",
237 "-fno-stack-protector",
237 "-w", // ignore all warnings238 "-w", // ignore all warnings
238239
239 o_arg,240 o_arg,