Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanups related to --eh-frame-hdr

master
Andrew Kelley 2020-01-07 16:02:38 -05:00
parent 8e57dd57ca
commit af390b75db
No known key found for this signature in database
GPG Key ID: 7C5F548F728501A9
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/std/build.zig
View File

@ -40,7 +40,6 @@ pub const Builder = struct {
verbose_ir: bool, verbose_ir: bool,
verbose_llvm_ir: bool, verbose_llvm_ir: bool,
verbose_cimport: bool, verbose_cimport: bool,
link_eh_frame_hdr: bool,
invalid_user_input: bool, invalid_user_input: bool,
zig_exe: []const u8, zig_exe: []const u8,
default_step: *Step, default_step: *Step,
@ -137,7 +136,6 @@ pub const Builder = struct {
.verbose_ir = false, .verbose_ir = false,
.verbose_llvm_ir = false, .verbose_llvm_ir = false,
.verbose_cimport = false, .verbose_cimport = false,
.link_eh_frame_hdr = false,
.invalid_user_input = false, .invalid_user_input = false,
.allocator = allocator, .allocator = allocator,
.native_system_lib_paths = ArrayList([]const u8).init(allocator), .native_system_lib_paths = ArrayList([]const u8).init(allocator),
@ -1627,10 +1625,6 @@ pub const LibExeObjStep = struct {
self.verbose_cc = value; self.verbose_cc = value;
} }
pub fn setLinkEhFrameHdr(self: *LibExeObjStep, value: bool) void {
self.link_eh_frame_hdr = value;
}
pub fn setBuildMode(self: *LibExeObjStep, mode: builtin.Mode) void { pub fn setBuildMode(self: *LibExeObjStep, mode: builtin.Mode) void {
self.build_mode = mode; self.build_mode = mode;
} }
@ -1916,10 +1910,12 @@ pub const LibExeObjStep = struct {
if (builder.verbose_llvm_ir) zig_args.append("--verbose-llvm-ir") catch unreachable; if (builder.verbose_llvm_ir) zig_args.append("--verbose-llvm-ir") catch unreachable;
if (builder.verbose_link or self.verbose_link) zig_args.append("--verbose-link") catch unreachable; if (builder.verbose_link or self.verbose_link) zig_args.append("--verbose-link") catch unreachable;
if (builder.verbose_cc or self.verbose_cc) zig_args.append("--verbose-cc") catch unreachable; if (builder.verbose_cc or self.verbose_cc) zig_args.append("--verbose-cc") catch unreachable;
if (builder.link_eh_frame_hdr or self.link_eh_frame_hdr) zig_args.append("--eh-frame-hdr") catch unreachable;
if (self.strip) { if (self.strip) {
zig_args.append("--strip") catch unreachable; try zig_args.append("--strip");
}
if (self.link_eh_frame_hdr) {
try zig_args.append("--eh-frame-hdr");
} }
if (self.single_threaded) { if (self.single_threaded) {

1
src/codegen.cpp
View File

@ -9511,7 +9511,6 @@ Error create_c_object_cache(CodeGen *g, CacheHash **out_cache_hash, bool verbose
cache_int(cache_hash, g->build_mode); cache_int(cache_hash, g->build_mode);
cache_bool(cache_hash, g->have_pic); cache_bool(cache_hash, g->have_pic);
cache_bool(cache_hash, g->have_sanitize_c); cache_bool(cache_hash, g->have_sanitize_c);
cache_bool(cache_hash, g->link_eh_frame_hdr);
cache_bool(cache_hash, want_valgrind_support(g)); cache_bool(cache_hash, want_valgrind_support(g));
cache_bool(cache_hash, g->function_sections); cache_bool(cache_hash, g->function_sections);
for (size_t arg_i = 0; arg_i < g->clang_argv_len; arg_i += 1) { for (size_t arg_i = 0; arg_i < g->clang_argv_len; arg_i += 1) {