diff --git a/lib/std/Build/CompileStep.zig b/lib/std/Build/CompileStep.zig index 2747f56af29699da3e337f1ca0bab2ca9761e7a8..b438331991cbe3e193b216dedae97d32d574f1bb 100644 --- a/lib/std/Build/CompileStep.zig +++ b/lib/std/Build/CompileStep.zig @@ -140,6 +140,9 @@ link_function_sections: bool = false, /// exported symbols. link_gc_sections: ?bool = null, +/// (Windows) Whether or not to enable ASLR. Maps to the /DYNAMICBASE[:NO] linker argument. +linker_dynamicbase: bool = true, + linker_allow_shlib_undefined: ?bool = null, /// Permit read-only relocations in read-only segments. Disallowed by default. @@ -1474,6 +1477,9 @@ fn make(step: *Step, prog_node: *std.Progress.Node) !void { if (self.link_gc_sections) |x| { try zig_args.append(if (x) "--gc-sections" else "--no-gc-sections"); } + if (!self.linker_dynamicbase) { + try zig_args.append("--no-dynamicbase"); + } if (self.linker_allow_shlib_undefined) |x| { try zig_args.append(if (x) "-fallow-shlib-undefined" else "-fno-allow-shlib-undefined"); } diff --git a/src/Compilation.zig b/src/Compilation.zig index 858afb6ca3da97c26650157ffb03048c0902b267..2c9b4e40638e2841c09d10b83a33235aa120d3ab 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -575,7 +575,7 @@ pub const InitOptions = struct { linker_z_max_page_size: ?u64 = null, linker_tsaware: bool = false, linker_nxcompat: bool = false, - linker_dynamicbase: bool = false, + linker_dynamicbase: bool = true, linker_optimization: ?u8 = null, linker_compress_debug_sections: ?link.CompressDebugSections = null, linker_module_definition_file: ?[]const u8 = null, diff --git a/src/link/Coff/lld.zig b/src/link/Coff/lld.zig index c308ff5989807764e3bcb37df7e63bb7d5f5b796..358c905b2c5eec07de86e5f7a9ec55dd0a8d4e1d 100644 --- a/src/link/Coff/lld.zig +++ b/src/link/Coff/lld.zig @@ -223,8 +223,8 @@ pub fn linkWithLLD(self: *Coff, comp: *Compilation, prog_node: *std.Progress.Nod if (self.base.options.nxcompat) { try argv.append("-nxcompat"); } - if (self.base.options.dynamicbase) { - try argv.append("-dynamicbase"); + if (!self.base.options.dynamicbase) { + try argv.append("-dynamicbase:NO"); } try argv.append(try allocPrint(arena, "-OUT:{s}", .{full_out_path})); diff --git a/src/main.zig b/src/main.zig index 961d649d387ba241250b2fa9f6154eff60f64c5e..c96fd2576680b8ca928f8e87752ccf932cf60e87 100644 --- a/src/main.zig +++ b/src/main.zig @@ -778,7 +778,7 @@ fn buildOutputType( var linker_z_max_page_size: ?u64 = null; var linker_tsaware = false; var linker_nxcompat = false; - var linker_dynamicbase = false; + var linker_dynamicbase = true; var linker_optimization: ?u8 = null; var linker_module_definition_file: ?[]const u8 = null; var test_evented_io = false; @@ -1371,6 +1371,10 @@ fn buildOutputType( linker_opt_bisect_limit = std.math.lossyCast(i32, parseIntSuffix(arg, "-fopt-bisect-limit=".len)); } else if (mem.eql(u8, arg, "--eh-frame-hdr")) { link_eh_frame_hdr = true; + } else if (mem.eql(u8, arg, "--dynamicbase")) { + linker_dynamicbase = true; + } else if (mem.eql(u8, arg, "--no-dynamicbase")) { + linker_dynamicbase = false; } else if (mem.eql(u8, arg, "--emit-relocs")) { link_emit_relocs = true; } else if (mem.eql(u8, arg, "-fallow-shlib-undefined")) { @@ -2105,8 +2109,8 @@ fn buildOutputType( linker_tsaware = true; } else if (mem.eql(u8, arg, "--nxcompat")) { linker_nxcompat = true; - } else if (mem.eql(u8, arg, "--dynamicbase")) { - linker_dynamicbase = true; + } else if (mem.eql(u8, arg, "--no-dynamicbase")) { + linker_dynamicbase = false; } else if (mem.eql(u8, arg, "--high-entropy-va")) { // This option does not do anything. } else if (mem.eql(u8, arg, "--export-all-symbols")) {