mirror of
https://github.com/ziglang/zig.git
synced 2025-12-06 06:13:07 +00:00
Move/coalesce CompressDebugSections enum to std.zig.CompressDebugSections
This commit is contained in:
parent
74d2536715
commit
f587209e04
@ -34,8 +34,7 @@ kind: Kind,
|
|||||||
major_only_filename: ?[]const u8,
|
major_only_filename: ?[]const u8,
|
||||||
name_only_filename: ?[]const u8,
|
name_only_filename: ?[]const u8,
|
||||||
formatted_panics: ?bool = null,
|
formatted_panics: ?bool = null,
|
||||||
// keep in sync with src/link.zig:CompressDebugSections
|
compress_debug_sections: std.zig.CompressDebugSections = .none,
|
||||||
compress_debug_sections: enum { none, zlib, zstd } = .none,
|
|
||||||
verbose_link: bool,
|
verbose_link: bool,
|
||||||
verbose_cc: bool,
|
verbose_cc: bool,
|
||||||
bundle_compiler_rt: ?bool = null,
|
bundle_compiler_rt: ?bool = null,
|
||||||
|
|||||||
@ -377,6 +377,8 @@ pub const Subsystem = enum {
|
|||||||
pub const EfiRuntimeDriver: Subsystem = .efi_runtime_driver;
|
pub const EfiRuntimeDriver: Subsystem = .efi_runtime_driver;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
pub const CompressDebugSections = enum { none, zlib, zstd };
|
||||||
|
|
||||||
/// Renders a `std.Target.Cpu` value into a textual representation that can be parsed
|
/// Renders a `std.Target.Cpu` value into a textual representation that can be parsed
|
||||||
/// via the `-mcpu` flag passed to the Zig compiler.
|
/// via the `-mcpu` flag passed to the Zig compiler.
|
||||||
/// Appends the result to `buffer`.
|
/// Appends the result to `buffer`.
|
||||||
|
|||||||
@ -1730,7 +1730,7 @@ pub const CreateOptions = struct {
|
|||||||
linker_tsaware: bool = false,
|
linker_tsaware: bool = false,
|
||||||
linker_nxcompat: bool = false,
|
linker_nxcompat: bool = false,
|
||||||
linker_dynamicbase: bool = true,
|
linker_dynamicbase: bool = true,
|
||||||
linker_compress_debug_sections: ?link.File.Lld.Elf.CompressDebugSections = null,
|
linker_compress_debug_sections: ?std.zig.CompressDebugSections = null,
|
||||||
linker_module_definition_file: ?[]const u8 = null,
|
linker_module_definition_file: ?[]const u8 = null,
|
||||||
linker_sort_section: ?link.File.Lld.Elf.SortSection = null,
|
linker_sort_section: ?link.File.Lld.Elf.SortSection = null,
|
||||||
major_subsystem_version: ?u16 = null,
|
major_subsystem_version: ?u16 = null,
|
||||||
|
|||||||
@ -428,7 +428,7 @@ pub const File = struct {
|
|||||||
tsaware: bool,
|
tsaware: bool,
|
||||||
nxcompat: bool,
|
nxcompat: bool,
|
||||||
dynamicbase: bool,
|
dynamicbase: bool,
|
||||||
compress_debug_sections: Lld.Elf.CompressDebugSections,
|
compress_debug_sections: std.zig.CompressDebugSections,
|
||||||
bind_global_refs_locally: bool,
|
bind_global_refs_locally: bool,
|
||||||
import_symbols: bool,
|
import_symbols: bool,
|
||||||
import_table: bool,
|
import_table: bool,
|
||||||
|
|||||||
@ -95,11 +95,12 @@ pub const Elf = struct {
|
|||||||
soname: ?[]const u8,
|
soname: ?[]const u8,
|
||||||
allow_undefined_version: bool,
|
allow_undefined_version: bool,
|
||||||
enable_new_dtags: ?bool,
|
enable_new_dtags: ?bool,
|
||||||
compress_debug_sections: CompressDebugSections,
|
compress_debug_sections: std.zig.CompressDebugSections,
|
||||||
bind_global_refs_locally: bool,
|
bind_global_refs_locally: bool,
|
||||||
pub const HashStyle = enum { sysv, gnu, both };
|
pub const HashStyle = enum { sysv, gnu, both };
|
||||||
pub const SortSection = enum { name, alignment };
|
pub const SortSection = enum { name, alignment };
|
||||||
pub const CompressDebugSections = enum { none, zlib, zstd };
|
/// Deprecated; use 'std.zig.CompressDebugSections' instead. To be removed after 0.16.0 is tagged.
|
||||||
|
pub const CompressDebugSections = std.zig.CompressDebugSections;
|
||||||
|
|
||||||
fn init(comp: *Compilation, options: link.File.OpenOptions) !Elf {
|
fn init(comp: *Compilation, options: link.File.OpenOptions) !Elf {
|
||||||
const PtrWidth = enum { p32, p64 };
|
const PtrWidth = enum { p32, p64 };
|
||||||
|
|||||||
10
src/main.zig
10
src/main.zig
@ -850,7 +850,7 @@ fn buildOutputType(
|
|||||||
var disable_c_depfile = false;
|
var disable_c_depfile = false;
|
||||||
var linker_sort_section: ?link.File.Lld.Elf.SortSection = null;
|
var linker_sort_section: ?link.File.Lld.Elf.SortSection = null;
|
||||||
var linker_gc_sections: ?bool = null;
|
var linker_gc_sections: ?bool = null;
|
||||||
var linker_compress_debug_sections: ?link.File.Lld.Elf.CompressDebugSections = null;
|
var linker_compress_debug_sections: ?std.zig.CompressDebugSections = null;
|
||||||
var linker_allow_shlib_undefined: ?bool = null;
|
var linker_allow_shlib_undefined: ?bool = null;
|
||||||
var allow_so_scripts: bool = false;
|
var allow_so_scripts: bool = false;
|
||||||
var linker_bind_global_refs_locally: ?bool = null;
|
var linker_bind_global_refs_locally: ?bool = null;
|
||||||
@ -1167,11 +1167,11 @@ fn buildOutputType(
|
|||||||
} else if (mem.eql(u8, arg, "-install_name")) {
|
} else if (mem.eql(u8, arg, "-install_name")) {
|
||||||
install_name = args_iter.nextOrFatal();
|
install_name = args_iter.nextOrFatal();
|
||||||
} else if (mem.cutPrefix(u8, arg, "--compress-debug-sections=")) |param| {
|
} else if (mem.cutPrefix(u8, arg, "--compress-debug-sections=")) |param| {
|
||||||
linker_compress_debug_sections = std.meta.stringToEnum(link.File.Lld.Elf.CompressDebugSections, param) orelse {
|
linker_compress_debug_sections = std.meta.stringToEnum(std.zig.CompressDebugSections, param) orelse {
|
||||||
fatal("expected --compress-debug-sections=[none|zlib|zstd], found '{s}'", .{param});
|
fatal("expected --compress-debug-sections=[none|zlib|zstd], found '{s}'", .{param});
|
||||||
};
|
};
|
||||||
} else if (mem.eql(u8, arg, "--compress-debug-sections")) {
|
} else if (mem.eql(u8, arg, "--compress-debug-sections")) {
|
||||||
linker_compress_debug_sections = link.File.Lld.Elf.CompressDebugSections.zlib;
|
linker_compress_debug_sections = .zlib;
|
||||||
} else if (mem.eql(u8, arg, "-pagezero_size")) {
|
} else if (mem.eql(u8, arg, "-pagezero_size")) {
|
||||||
const next_arg = args_iter.nextOrFatal();
|
const next_arg = args_iter.nextOrFatal();
|
||||||
pagezero_size = std.fmt.parseUnsigned(u64, eatIntPrefix(next_arg, 16), 16) catch |err| {
|
pagezero_size = std.fmt.parseUnsigned(u64, eatIntPrefix(next_arg, 16), 16) catch |err| {
|
||||||
@ -2335,7 +2335,7 @@ fn buildOutputType(
|
|||||||
if (it.only_arg.len == 0) {
|
if (it.only_arg.len == 0) {
|
||||||
linker_compress_debug_sections = .zlib;
|
linker_compress_debug_sections = .zlib;
|
||||||
} else {
|
} else {
|
||||||
linker_compress_debug_sections = std.meta.stringToEnum(link.File.Lld.Elf.CompressDebugSections, it.only_arg) orelse {
|
linker_compress_debug_sections = std.meta.stringToEnum(std.zig.CompressDebugSections, it.only_arg) orelse {
|
||||||
fatal("expected [none|zlib|zstd] after --compress-debug-sections, found '{s}'", .{it.only_arg});
|
fatal("expected [none|zlib|zstd] after --compress-debug-sections, found '{s}'", .{it.only_arg});
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@ -2523,7 +2523,7 @@ fn buildOutputType(
|
|||||||
try linker_export_symbol_names.append(arena, linker_args_it.nextOrFatal());
|
try linker_export_symbol_names.append(arena, linker_args_it.nextOrFatal());
|
||||||
} else if (mem.eql(u8, arg, "--compress-debug-sections")) {
|
} else if (mem.eql(u8, arg, "--compress-debug-sections")) {
|
||||||
const arg1 = linker_args_it.nextOrFatal();
|
const arg1 = linker_args_it.nextOrFatal();
|
||||||
linker_compress_debug_sections = std.meta.stringToEnum(link.File.Lld.Elf.CompressDebugSections, arg1) orelse {
|
linker_compress_debug_sections = std.meta.stringToEnum(std.zig.CompressDebugSections, arg1) orelse {
|
||||||
fatal("expected [none|zlib|zstd] after --compress-debug-sections, found '{s}'", .{arg1});
|
fatal("expected [none|zlib|zstd] after --compress-debug-sections, found '{s}'", .{arg1});
|
||||||
};
|
};
|
||||||
} else if (mem.cutPrefix(u8, arg, "-z")) |z_rest| {
|
} else if (mem.cutPrefix(u8, arg, "-z")) |z_rest| {
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user