authorgravatar for leecannon@leecannon.xyzLee Cannon <leecannon@leecannon.xyz> 2020-12-20 21:41:00+00:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-01-11 22:07:14-07:00
log8932c2d7456fc86b9e92c7976cedcce798caef1a
treef1a592127ee02e182eead556b6946b13a7d55edb
parent56c03881ebd8617e6506bfad01bf9cfdd4d3df7e

Added support for no red zone

13 files changed, 37 insertions(+), 1 deletions(-)

lib/std/build.zig+4
......@@ -1262,6 +1262,7 @@ pub const LibExeObjStep = struct {
12621262 disable_stack_probing: bool,
12631263 disable_sanitize_c: bool,
12641264 sanitize_thread: bool,
1265 no_red_zone: bool = false,
12651266 rdynamic: bool,
12661267 c_std: Builder.CStd,
12671268 override_lib_dir: ?[]const u8,
......@@ -2260,6 +2261,9 @@ pub const LibExeObjStep = struct {
22602261 if (self.disable_stack_probing) {
22612262 try zig_args.append("-fno-stack-check");
22622263 }
2264 if (self.no_red_zone) {
2265 try zig_args.append("-fno-red-zone");
2266 }
22632267 if (self.disable_sanitize_c) {
22642268 try zig_args.append("-fno-sanitize-c");
22652269 }
src/Compilation.zig+11-1
......@@ -392,6 +392,7 @@ pub const InitOptions = struct {
392392 want_pie: ?bool = null,
393393 want_sanitize_c: ?bool = null,
394394 want_stack_check: ?bool = null,
395 no_red_zone: bool = false,
395396 want_valgrind: ?bool = null,
396397 want_tsan: ?bool = null,
397398 want_compiler_rt: ?bool = null,
......@@ -773,6 +774,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
773774 cache.hash.add(pie);
774775 cache.hash.add(tsan);
775776 cache.hash.add(stack_check);
777 cache.hash.add(options.no_red_zone);
776778 cache.hash.add(link_mode);
777779 cache.hash.add(options.function_sections);
778780 cache.hash.add(strip);
......@@ -982,6 +984,7 @@ pub fn create(gpa: *Allocator, options: InitOptions) !*Compilation {
982984 .valgrind = valgrind,
983985 .tsan = tsan,
984986 .stack_check = stack_check,
987 .no_red_zone = options.no_red_zone,
985988 .single_threaded = single_threaded,
986989 .verbose_link = options.verbose_link,
987990 .machine_code_model = options.machine_code_model,
......@@ -2255,7 +2258,11 @@ pub fn addCCArgs(
22552258 } else if (!comp.sanitize_c and comp.bin_file.options.tsan) {
22562259 try argv.append("-fsanitize=thread");
22572260 }
2258
2261
2262 if (comp.bin_file.options.no_red_zone) {
2263 try argv.append("-mno-red-zone");
2264 }
2265
22592266 switch (comp.bin_file.options.optimize_mode) {
22602267 .Debug => {
22612268 // windows c runtime requires -D_DEBUG if using debug libraries
......@@ -2960,6 +2967,7 @@ fn buildOutputFromZig(
29602967 .function_sections = true,
29612968 .want_sanitize_c = false,
29622969 .want_stack_check = false,
2970 .no_red_zone = comp.bin_file.options.no_red_zone,
29632971 .want_valgrind = false,
29642972 .want_tsan = false,
29652973 .want_pic = comp.bin_file.options.pic,
......@@ -3198,6 +3206,7 @@ fn updateStage1Module(comp: *Compilation, main_progress_node: *std.Progress.Node
31983206 .tsan_enabled = comp.bin_file.options.tsan,
31993207 .function_sections = comp.bin_file.options.function_sections,
32003208 .enable_stack_probing = comp.bin_file.options.stack_check,
3209 .no_red_zone = comp.bin_file.options.no_red_zone,
32013210 .enable_time_report = comp.time_report,
32023211 .enable_stack_report = comp.stack_report,
32033212 .test_is_evented = comp.test_evented_io,
......@@ -3342,6 +3351,7 @@ pub fn build_crt_file(
33423351 .optimize_mode = comp.compilerRtOptMode(),
33433352 .want_sanitize_c = false,
33443353 .want_stack_check = false,
3354 .no_red_zone = comp.bin_file.options.no_red_zone,
33453355 .want_valgrind = false,
33463356 .want_tsan = false,
33473357 .want_pic = comp.bin_file.options.pic,
src/glibc.zig+1
......@@ -934,6 +934,7 @@ fn buildSharedLib(
934934 .optimize_mode = comp.compilerRtOptMode(),
935935 .want_sanitize_c = false,
936936 .want_stack_check = false,
937 .no_red_zone = comp.bin_file.options.no_red_zone,
937938 .want_valgrind = false,
938939 .want_tsan = false,
939940 .emit_h = null,
src/libcxx.zig+2
......@@ -167,6 +167,7 @@ pub fn buildLibCXX(comp: *Compilation) !void {
167167 .link_mode = link_mode,
168168 .want_sanitize_c = false,
169169 .want_stack_check = false,
170 .no_red_zone = comp.bin_file.options.no_red_zone,
170171 .want_valgrind = false,
171172 .want_tsan = comp.bin_file.options.tsan,
172173 .want_pic = comp.bin_file.options.pic,
......@@ -284,6 +285,7 @@ pub fn buildLibCXXABI(comp: *Compilation) !void {
284285 .link_mode = link_mode,
285286 .want_sanitize_c = false,
286287 .want_stack_check = false,
288 .no_red_zone = comp.bin_file.options.no_red_zone,
287289 .want_valgrind = false,
288290 .want_tsan = comp.bin_file.options.tsan,
289291 .want_pic = comp.bin_file.options.pic,
src/libunwind.zig+1
......@@ -108,6 +108,7 @@ pub fn buildStaticLib(comp: *Compilation) !void {
108108 .link_mode = link_mode,
109109 .want_sanitize_c = false,
110110 .want_stack_check = false,
111 .no_red_zone = comp.bin_file.options.no_red_zone,
111112 .want_valgrind = false,
112113 .want_tsan = false,
113114 .want_pic = comp.bin_file.options.pic,
src/link.zig+1
......@@ -77,6 +77,7 @@ pub const Options = struct {
7777 valgrind: bool,
7878 tsan: bool,
7979 stack_check: bool,
80 no_red_zone: bool,
8081 single_threaded: bool,
8182 verbose_link: bool,
8283 dll_export_fns: bool,
src/main.zig+8
......@@ -282,6 +282,8 @@ const usage_build_generic =
282282 \\ -fno-PIE Force-disable Position Independent Executable
283283 \\ -fstack-check Enable stack probing in unsafe builds
284284 \\ -fno-stack-check Disable stack probing in safe builds
285 \\ -fred-zone Enable the "red-zone"
286 \\ -fno-red-zone Disable the "red-zone"
285287 \\ -fsanitize-c Enable C undefined behavior detection in unsafe builds
286288 \\ -fno-sanitize-c Disable C undefined behavior detection in safe builds
287289 \\ -fvalgrind Include valgrind client requests in release builds
......@@ -505,6 +507,7 @@ fn buildOutputType(
505507 var want_pie: ?bool = null;
506508 var want_sanitize_c: ?bool = null;
507509 var want_stack_check: ?bool = null;
510 var no_red_zone: bool = false;
508511 var want_valgrind: ?bool = null;
509512 var want_tsan: ?bool = null;
510513 var want_compiler_rt: ?bool = null;
......@@ -843,6 +846,10 @@ fn buildOutputType(
843846 want_stack_check = true;
844847 } else if (mem.eql(u8, arg, "-fno-stack-check")) {
845848 want_stack_check = false;
849 } else if (mem.eql(u8, arg, "-fred-zone")) {
850 no_red_zone = false;
851 } else if (mem.eql(u8, arg, "-fno-red-zone")) {
852 no_red_zone = true;
846853 } else if (mem.eql(u8, arg, "-fsanitize-c")) {
847854 want_sanitize_c = true;
848855 } else if (mem.eql(u8, arg, "-fno-sanitize-c")) {
......@@ -1760,6 +1767,7 @@ fn buildOutputType(
17601767 .want_pie = want_pie,
17611768 .want_sanitize_c = want_sanitize_c,
17621769 .want_stack_check = want_stack_check,
1770 .no_red_zone = no_red_zone,
17631771 .want_valgrind = want_valgrind,
17641772 .want_tsan = want_tsan,
17651773 .want_compiler_rt = want_compiler_rt,
src/musl.zig+1
......@@ -206,6 +206,7 @@ pub fn buildCRTFile(comp: *Compilation, crt_file: CRTFile) !void {
206206 .optimize_mode = comp.compilerRtOptMode(),
207207 .want_sanitize_c = false,
208208 .want_stack_check = false,
209 .no_red_zone = comp.bin_file.options.no_red_zone,
209210 .want_valgrind = false,
210211 .want_tsan = false,
211212 .emit_h = null,
src/stage1.zig+1
......@@ -119,6 +119,7 @@ pub const Module = extern struct {
119119 tsan_enabled: bool,
120120 function_sections: bool,
121121 enable_stack_probing: bool,
122 no_red_zone: bool,
122123 enable_time_report: bool,
123124 enable_stack_report: bool,
124125 test_is_evented: bool,
src/stage1/all_types.hpp+1
......@@ -2195,6 +2195,7 @@ struct CodeGen {
21952195 bool link_mode_dynamic;
21962196 bool dll_export_fns;
21972197 bool have_stack_probing;
2198 bool no_red_zone;
21982199 bool function_sections;
21992200 bool test_is_evented;
22002201 bool valgrind_enabled;
src/stage1/codegen.cpp+4
......@@ -513,6 +513,10 @@ static LLVMValueRef make_fn_llvm_value(CodeGen *g, ZigFn *fn) {
513513 } else {
514514 maybe_import_dll(g, llvm_fn, linkage);
515515 }
516
517 if (g->no_red_zone) {
518 addLLVMFnAttr(llvm_fn, "noredzone");
519 }
516520
517521 if (fn->alignstack_value != 0) {
518522 addLLVMFnAttrInt(llvm_fn, "alignstack", fn->alignstack_value);
src/stage1/stage1.cpp+1
......@@ -91,6 +91,7 @@ void zig_stage1_build_object(struct ZigStage1 *stage1) {
9191 g->have_pic = stage1->pic;
9292 g->have_pie = stage1->pie;
9393 g->have_stack_probing = stage1->enable_stack_probing;
94 g->no_red_zone = stage1->no_red_zone;
9495 g->is_single_threaded = stage1->is_single_threaded;
9596 g->valgrind_enabled = stage1->valgrind_enabled;
9697 g->tsan_enabled = stage1->tsan_enabled;
src/stage1/stage1.h+1
......@@ -188,6 +188,7 @@ struct ZigStage1 {
188188 bool tsan_enabled;
189189 bool function_sections;
190190 bool enable_stack_probing;
191 bool no_red_zone;
191192 bool enable_time_report;
192193 bool enable_stack_report;
193194 bool test_is_evented;