mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 14:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compilation: strip debug info from ReleaseSmall by default

Browse Source
This commit is contained in:
Ali Chraghi 2022-10-05 14:33:11 +03:30 committed by Veikka Tuominen
parent 42a3b60c33
commit d086b371f0
10 changed files with 29 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.zig
View File

@ -309,15 +309,15 @@ pub fn build(b: *Builder) !void {
.Debug => {},
.ReleaseFast => {
zig1_obj.addArg("-OReleaseFast");
zig1_obj.addArg("--strip");
zig1_obj.addArg("-fstrip");
},
.ReleaseSafe => {
zig1_obj.addArg("-OReleaseSafe");
zig1_obj.addArg("--strip");
zig1_obj.addArg("-fstrip");
},
.ReleaseSmall => {
zig1_obj.addArg("-OReleaseSmall");
zig1_obj.addArg("--strip");
zig1_obj.addArg("-fstrip");
},
}
if (single_threaded orelse false) {

14
lib/std/build.zig
View File

@ -1468,7 +1468,7 @@ pub const LibExeObjStep = struct {
kind: Kind,
major_only_filename: ?[]const u8,
name_only_filename: ?[]const u8,
strip: bool,
strip: ?bool,
// keep in sync with src/link.zig:CompressDebugSections
compress_debug_sections: enum { none, zlib } = .none,
lib_paths: ArrayList([]const u8),
@ -1738,7 +1738,7 @@ pub const LibExeObjStep = struct {
const self = builder.allocator.create(LibExeObjStep) catch unreachable;
self.* = LibExeObjStep{
.strip = false,
.strip = null,
.builder = builder,
.verbose_link = false,
.verbose_cc = false,
@ -1953,7 +1953,7 @@ pub const LibExeObjStep = struct {
pub fn producesPdbFile(self: *LibExeObjStep) bool {
if (!self.target.isWindows() and !self.target.isUefi()) return false;
if (self.strip) return false;
if (self.strip != null and self.strip.?) return false;
return self.isDynamicLibrary() or self.kind == .exe or self.kind == .test_exe;
}
@ -2690,8 +2690,12 @@ pub const LibExeObjStep = struct {
if (self.emit_h) try zig_args.append("-femit-h");
if (self.strip) {
try zig_args.append("--strip");
if (self.strip) |strip| {
if (strip) {
try zig_args.append("-fstrip");
} else {
try zig_args.append("-fno-strip");
}
}
switch (self.compress_debug_sections) {

4
src/Compilation.zig
View File

@ -916,8 +916,8 @@ pub const InitOptions = struct {
use_clang: ?bool = null,
use_stage1: ?bool = null,
single_threaded: ?bool = null,
strip: ?bool = null,
rdynamic: bool = false,
strip: bool = false,
function_sections: bool = false,
no_builtin: bool = false,
is_native_os: bool,
@ -1422,7 +1422,7 @@ pub fn create(gpa: Allocator, options: InitOptions) !*Compilation {
break :blk buf.items[0 .. buf.items.len - 1 :0].ptr;
} else null;
const strip = options.strip or !target_util.hasDebugInfo(options.target);
const strip = options.strip orelse !target_util.hasDebugInfo(options.target);
const red_zone = options.want_red_zone orelse target_util.hasRedZone(options.target);
const omit_frame_pointer = options.omit_frame_pointer orelse (options.optimize_mode != .Debug);
const linker_optimization: u8 = options.linker_optimization orelse switch (options.optimize_mode) {

13
src/main.zig
View File

@ -404,7 +404,8 @@ const usage_build_generic =
\\ -fno-builtin Disable implicit builtin knowledge of functions
\\ -ffunction-sections Places each function in a separate section
\\ -fno-function-sections All functions go into same section
\\ --strip Omit debug symbols
\\ -fstrip Omit debug symbols
\\ -fno-strip Keep debug symbols
\\ -ofmt=[mode] Override target object format
\\ elf Executable and Linking Format
\\ c C source code
@ -630,7 +631,7 @@ fn buildOutputType(
var version: std.builtin.Version = .{ .major = 0, .minor = 0, .patch = 0 };
var have_version = false;
var compatibility_version: ?std.builtin.Version = null;
var strip = false;
var strip: ?bool = null;
var function_sections = false;
var no_builtin = false;
var watch = false;
@ -1296,8 +1297,10 @@ fn buildOutputType(
} else if (mem.eql(u8, arg, "--show-builtin")) {
show_builtin = true;
emit_bin = .no;
} else if (mem.eql(u8, arg, "--strip")) {
} else if (mem.eql(u8, arg, "-fstrip")) {
strip = true;
} else if (mem.eql(u8, arg, "-fno-strip")) {
strip = false;
} else if (mem.eql(u8, arg, "-fsingle-threaded")) {
single_threaded = true;
} else if (mem.eql(u8, arg, "-fno-single-threaded")) {
@ -1432,7 +1435,6 @@ fn buildOutputType(
.cc, .cpp => {
emit_h = .no;
soname = .no;
strip = false;
ensure_libc_on_non_freestanding = true;
ensure_libcpp_on_non_freestanding = arg_mode == .cpp;
want_native_include_dirs = true;
@ -2186,6 +2188,9 @@ fn buildOutputType(
},
}
if (arg_mode == .build and optimize_mode == .ReleaseSmall and strip == null)
strip = true;
if (arg_mode == .translate_c and c_source_files.items.len != 1) {
fatal("translate-c expects exactly 1 source file (found {d})", .{c_source_files.items.len});
}

2
test/cli.zig
View File

@ -133,7 +133,7 @@ fn testGodboltApi(zig_exe: []const u8, dir_path: []const u8) anyerror!void {
"--cache-dir", dir_path,
"--name", "example",
"-fno-emit-bin", "-fno-emit-h",
"--strip", "-OReleaseFast",
"-fstrip", "-OReleaseFast",
example_zig_path,
});

1
test/link/wasm/archive/build.zig
View File

@ -15,6 +15,7 @@ pub fn build(b: *Builder) void {
lib.use_llvm = false;
lib.use_stage1 = false;
lib.use_lld = false;
lib.strip = false;
const check = lib.checkObject(.wasm);
check.checkStart("Section import");

1
test/link/wasm/bss/build.zig
View File

@ -13,6 +13,7 @@ pub fn build(b: *Builder) void {
lib.use_llvm = false;
lib.use_stage1 = false;
lib.use_lld = false;
lib.strip = false;
// to make sure the bss segment is emitted, we must import memory
lib.import_memory = true;
lib.install();

1
test/link/wasm/segments/build.zig
View File

@ -13,6 +13,7 @@ pub fn build(b: *Builder) void {
lib.use_llvm = false;
lib.use_stage1 = false;
lib.use_lld = false;
lib.strip = false;
lib.install();
const check_lib = lib.checkObject(.wasm);

1
test/link/wasm/stack_pointer/build.zig
View File

@ -13,6 +13,7 @@ pub fn build(b: *Builder) void {
lib.use_llvm = false;
lib.use_stage1 = false;
lib.use_lld = false;
lib.strip = false;
lib.stack_size = std.wasm.page_size * 2; // set an explicit stack size
lib.install();

1
test/link/wasm/type/build.zig
View File

@ -13,6 +13,7 @@ pub fn build(b: *Builder) void {
lib.use_llvm = false;
lib.use_stage1 = false;
lib.use_lld = false;
lib.strip = false;
lib.install();
const check_lib = lib.checkObject(.wasm);