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

move zig objcopy command to be lazily built

Browse Source 
part of #19063
This commit is contained in:
Andrew Kelley 2024-03-02 16:01:29 -07:00
parent aa688567f5
commit 33de937fd9
2 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/objcopy.zig → lib/compiler/objcopy.zig
View File

@ -1,3 +1,4 @@
const builtin = @import("builtin");
const std = @import("std"); const std = @import("std");
const mem = std.mem; const mem = std.mem;
const fs = std.fs; const fs = std.fs;
@ -6,12 +7,22 @@ const Allocator = std.mem.Allocator;
const File = std.fs.File; const File = std.fs.File;
const assert = std.debug.assert; const assert = std.debug.assert;
const main = @import("main.zig"); const fatal = std.zig.fatal;
const fatal = main.fatal;
const Server = std.zig.Server; const Server = std.zig.Server;
const build_options = @import("build_options");
pub fn cmdObjCopy( pub fn main() !void {
var arena_instance = std.heap.ArenaAllocator.init(std.heap.page_allocator);
defer arena_instance.deinit();
const arena = arena_instance.allocator();
var general_purpose_allocator: std.heap.GeneralPurposeAllocator(.{}) = .{};
const gpa = general_purpose_allocator.allocator();
const args = try std.process.argsAlloc(arena);
return cmdObjCopy(gpa, arena, args[1..]);
}
fn cmdObjCopy(
gpa: Allocator, gpa: Allocator,
arena: Allocator, arena: Allocator,
args: []const []const u8, args: []const []const u8,
@ -148,7 +159,7 @@ pub fn cmdObjCopy(
}); });
}, },
.elf => { .elf => {
if (elf_hdr.endian != @import("builtin").target.cpu.arch.endian()) if (elf_hdr.endian != builtin.target.cpu.arch.endian())
fatal("zig objcopy: ELF to ELF copying only supports native endian", .{}); fatal("zig objcopy: ELF to ELF copying only supports native endian", .{});
if (elf_hdr.phoff == 0) // no program header if (elf_hdr.phoff == 0) // no program header
fatal("zig objcopy: ELF to ELF copying only supports programs", .{}); fatal("zig objcopy: ELF to ELF copying only supports programs", .{});
@ -175,7 +186,7 @@ pub fn cmdObjCopy(
.gpa = gpa, .gpa = gpa,
.in = std.io.getStdIn(), .in = std.io.getStdIn(),
.out = std.io.getStdOut(), .out = std.io.getStdOut(),
.zig_version = build_options.version, .zig_version = builtin.zig_version_string,
}); });
defer server.deinit(); defer server.deinit();

5
src/main.zig
View File

@ -297,7 +297,10 @@ fn mainArgs(gpa: Allocator, arena: Allocator, args: []const []const u8) !void {
.root_src_path = "fmt.zig", .root_src_path = "fmt.zig",
}); });
} else if (mem.eql(u8, cmd, "objcopy")) { } else if (mem.eql(u8, cmd, "objcopy")) {
return @import("objcopy.zig").cmdObjCopy(gpa, arena, cmd_args); return jitCmd(gpa, arena, cmd_args, .{
.cmd_name = "objcopy",
.root_src_path = "objcopy.zig",
});
} else if (mem.eql(u8, cmd, "fetch")) { } else if (mem.eql(u8, cmd, "fetch")) {
return cmdFetch(gpa, arena, cmd_args); return cmdFetch(gpa, arena, cmd_args);
} else if (mem.eql(u8, cmd, "libc")) { } else if (mem.eql(u8, cmd, "libc")) {