authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-07 16:02:38-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-07 16:02:38-05:00
logaf390b75dbdb33f6ccf80c14d32ee5b89421c35b
treeed6c69e1735acc2ee9615b86a9a12fb25b192eb4
parent8e57dd57cab68b469fcdfd4792ceb5ca09220924
signaturelock-open Commit is signed but in an unrecognized format.

cleanups related to --eh-frame-hdr

2 files changed, 4 insertions(+), 9 deletions(-)

lib/std/build.zig+4-8
...@@ -40,7 +40,6 @@ pub const Builder = struct {...@@ -40,7 +40,6 @@ pub const Builder = struct {
40 verbose_ir: bool,40 verbose_ir: bool,
41 verbose_llvm_ir: bool,41 verbose_llvm_ir: bool,
42 verbose_cimport: bool,42 verbose_cimport: bool,
43 link_eh_frame_hdr: bool,
44 invalid_user_input: bool,43 invalid_user_input: bool,
45 zig_exe: []const u8,44 zig_exe: []const u8,
46 default_step: *Step,45 default_step: *Step,
...@@ -137,7 +136,6 @@ pub const Builder = struct {...@@ -137,7 +136,6 @@ pub const Builder = struct {
137 .verbose_ir = false,136 .verbose_ir = false,
138 .verbose_llvm_ir = false,137 .verbose_llvm_ir = false,
139 .verbose_cimport = false,138 .verbose_cimport = false,
140 .link_eh_frame_hdr = false,
141 .invalid_user_input = false,139 .invalid_user_input = false,
142 .allocator = allocator,140 .allocator = allocator,
143 .native_system_lib_paths = ArrayList([]const u8).init(allocator),141 .native_system_lib_paths = ArrayList([]const u8).init(allocator),
...@@ -1627,10 +1625,6 @@ pub const LibExeObjStep = struct {...@@ -1627,10 +1625,6 @@ pub const LibExeObjStep = struct {
1627 self.verbose_cc = value;1625 self.verbose_cc = value;
1628 }1626 }
16291627
1630 pub fn setLinkEhFrameHdr(self: *LibExeObjStep, value: bool) void {
1631 self.link_eh_frame_hdr = value;
1632 }
1633
1634 pub fn setBuildMode(self: *LibExeObjStep, mode: builtin.Mode) void {1628 pub fn setBuildMode(self: *LibExeObjStep, mode: builtin.Mode) void {
1635 self.build_mode = mode;1629 self.build_mode = mode;
1636 }1630 }
...@@ -1916,10 +1910,12 @@ pub const LibExeObjStep = struct {...@@ -1916,10 +1910,12 @@ pub const LibExeObjStep = struct {
1916 if (builder.verbose_llvm_ir) zig_args.append("--verbose-llvm-ir") catch unreachable;1910 if (builder.verbose_llvm_ir) zig_args.append("--verbose-llvm-ir") catch unreachable;
1917 if (builder.verbose_link or self.verbose_link) zig_args.append("--verbose-link") catch unreachable;1911 if (builder.verbose_link or self.verbose_link) zig_args.append("--verbose-link") catch unreachable;
1918 if (builder.verbose_cc or self.verbose_cc) zig_args.append("--verbose-cc") catch unreachable;1912 if (builder.verbose_cc or self.verbose_cc) zig_args.append("--verbose-cc") catch unreachable;
1919 if (builder.link_eh_frame_hdr or self.link_eh_frame_hdr) zig_args.append("--eh-frame-hdr") catch unreachable;
19201913
1921 if (self.strip) {1914 if (self.strip) {
1922 zig_args.append("--strip") catch unreachable;1915 try zig_args.append("--strip");
1916 }
1917 if (self.link_eh_frame_hdr) {
1918 try zig_args.append("--eh-frame-hdr");
1923 }1919 }
19241920
1925 if (self.single_threaded) {1921 if (self.single_threaded) {
src/codegen.cpp-1
...@@ -9511,7 +9511,6 @@ Error create_c_object_cache(CodeGen *g, CacheHash **out_cache_hash, bool verbose...@@ -9511,7 +9511,6 @@ Error create_c_object_cache(CodeGen *g, CacheHash **out_cache_hash, bool verbose
9511 cache_int(cache_hash, g->build_mode);9511 cache_int(cache_hash, g->build_mode);
9512 cache_bool(cache_hash, g->have_pic);9512 cache_bool(cache_hash, g->have_pic);
9513 cache_bool(cache_hash, g->have_sanitize_c);9513 cache_bool(cache_hash, g->have_sanitize_c);
9514 cache_bool(cache_hash, g->link_eh_frame_hdr);
9515 cache_bool(cache_hash, want_valgrind_support(g));9514 cache_bool(cache_hash, want_valgrind_support(g));
9516 cache_bool(cache_hash, g->function_sections);9515 cache_bool(cache_hash, g->function_sections);
9517 for (size_t arg_i = 0; arg_i < g->clang_argv_len; arg_i += 1) {9516 for (size_t arg_i = 0; arg_i < g->clang_argv_len; arg_i += 1) {