authorgravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-06-29 18:24:00+02:00
committergravatar for kubkon@jakubkonka.comJakub Konka <kubkon@jakubkonka.com> 2021-06-29 23:38:19+02:00
log0e15205521b9a8c95db3c1714dffe3be1df5cda1
treead3ee1bcad5a109219ba7e30e1fbd7dc206bc3a6
parent8211cef77c15d37d3ec9b92943476c7755ef7efc

Remove mention of lldMachO from the project

including: * finding lldMachO in CMake config * punting `ld64.lld` to LLD linker * providing bindings to LLD linker

5 files changed, 0 insertions(+), 13 deletions(-)

cmake/Findlld.cmake-1
......@@ -42,7 +42,6 @@ else()
4242 FIND_AND_ADD_LLD_LIB(lldMinGW)
4343 FIND_AND_ADD_LLD_LIB(lldELF)
4444 FIND_AND_ADD_LLD_LIB(lldCOFF)
45 FIND_AND_ADD_LLD_LIB(lldMachO)
4645 FIND_AND_ADD_LLD_LIB(lldWasm)
4746 FIND_AND_ADD_LLD_LIB(lldReaderWriter)
4847 FIND_AND_ADD_LLD_LIB(lldCore)
src/codegen/llvm/bindings.zig-2
......@@ -496,12 +496,10 @@ fn LLVMInitializeAllAsmParsers() callconv(.C) void {
496496
497497extern fn ZigLLDLinkCOFF(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;
498498extern fn ZigLLDLinkELF(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;
499extern fn ZigLLDLinkMachO(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;
500499extern fn ZigLLDLinkWasm(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;
501500
502501pub const LinkCOFF = ZigLLDLinkCOFF;
503502pub const LinkELF = ZigLLDLinkELF;
504pub const LinkMachO = ZigLLDLinkMachO;
505503pub const LinkWasm = ZigLLDLinkWasm;
506504
507505pub const ObjectFormatType = enum(c_int) {
src/main.zig-4
......@@ -226,7 +226,6 @@ pub fn mainArgs(gpa: *Allocator, arena: *Allocator, args: []const []const u8) !v
226226 {
227227 return punt_to_clang(arena, args);
228228 } else if (mem.eql(u8, cmd, "ld.lld") or
229 mem.eql(u8, cmd, "ld64.lld") or
230229 mem.eql(u8, cmd, "lld-link") or
231230 mem.eql(u8, cmd, "wasm-ld"))
232231 {
......@@ -3384,7 +3383,6 @@ fn punt_to_llvm_ar(arena: *Allocator, args: []const []const u8) error{OutOfMemor
33843383
33853384/// The first argument determines which backend is invoked. The options are:
33863385/// * `ld.lld` - ELF
3387/// * `ld64.lld` - Mach-O
33883386/// * `lld-link` - COFF
33893387/// * `wasm-ld` - WebAssembly
33903388/// TODO https://github.com/ziglang/zig/issues/3257
......@@ -3402,8 +3400,6 @@ pub fn punt_to_lld(arena: *Allocator, args: []const []const u8) error{OutOfMemor
34023400 const argc = @intCast(c_int, argv.len);
34033401 if (mem.eql(u8, args[1], "ld.lld")) {
34043402 break :rc llvm.LinkELF(argc, argv.ptr, true);
3405 } else if (mem.eql(u8, args[1], "ld64.lld")) {
3406 break :rc llvm.LinkMachO(argc, argv.ptr, true);
34073403 } else if (mem.eql(u8, args[1], "lld-link")) {
34083404 break :rc llvm.LinkCOFF(argc, argv.ptr, true);
34093405 } else if (mem.eql(u8, args[1], "wasm-ld")) {
src/zig_llvm.cpp-5
......@@ -1187,11 +1187,6 @@ int ZigLLDLinkELF(int argc, const char **argv, bool can_exit_early) {
11871187 return lld::elf::link(args, can_exit_early, llvm::outs(), llvm::errs());
11881188}
11891189
1190int ZigLLDLinkMachO(int argc, const char **argv, bool can_exit_early) {
1191 std::vector<const char *> args(argv, argv + argc);
1192 return lld::mach_o::link(args, can_exit_early, llvm::outs(), llvm::errs());
1193}
1194
11951190int ZigLLDLinkWasm(int argc, const char **argv, bool can_exit_early) {
11961191 std::vector<const char *> args(argv, argv + argc);
11971192 return lld::wasm::link(args, can_exit_early, llvm::outs(), llvm::errs());
src/zig_llvm.h-1
......@@ -514,7 +514,6 @@ ZIG_EXTERN_C const char *ZigLLVMGetEnvironmentTypeName(enum ZigLLVM_EnvironmentT
514514
515515ZIG_EXTERN_C int ZigLLDLinkCOFF(int argc, const char **argv, bool can_exit_early);
516516ZIG_EXTERN_C int ZigLLDLinkELF(int argc, const char **argv, bool can_exit_early);
517ZIG_EXTERN_C int ZigLLDLinkMachO(int argc, const char **argv, bool can_exit_early);
518517ZIG_EXTERN_C int ZigLLDLinkWasm(int argc, const char **argv, bool can_exit_early);
519518
520519ZIG_EXTERN_C bool ZigLLVMWriteArchive(const char *archive_name, const char **file_names, size_t file_name_count,