diff --git a/cmake/Findlld.cmake b/cmake/Findlld.cmake index 72724ecd1e..729243bba7 100644 --- a/cmake/Findlld.cmake +++ b/cmake/Findlld.cmake @@ -42,7 +42,6 @@ else() FIND_AND_ADD_LLD_LIB(lldMinGW) FIND_AND_ADD_LLD_LIB(lldELF) FIND_AND_ADD_LLD_LIB(lldCOFF) - FIND_AND_ADD_LLD_LIB(lldMachO) FIND_AND_ADD_LLD_LIB(lldWasm) FIND_AND_ADD_LLD_LIB(lldReaderWriter) FIND_AND_ADD_LLD_LIB(lldCore) diff --git a/src/codegen/llvm/bindings.zig b/src/codegen/llvm/bindings.zig index 364b059a87..f3a1a72f3d 100644 --- a/src/codegen/llvm/bindings.zig +++ b/src/codegen/llvm/bindings.zig @@ -496,12 +496,10 @@ fn LLVMInitializeAllAsmParsers() callconv(.C) void { extern fn ZigLLDLinkCOFF(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int; extern fn ZigLLDLinkELF(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int; -extern fn ZigLLDLinkMachO(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int; extern fn ZigLLDLinkWasm(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int; pub const LinkCOFF = ZigLLDLinkCOFF; pub const LinkELF = ZigLLDLinkELF; -pub const LinkMachO = ZigLLDLinkMachO; pub const LinkWasm = ZigLLDLinkWasm; pub const ObjectFormatType = enum(c_int) { diff --git a/src/main.zig b/src/main.zig index 86995c5b9f..192f6d853c 100644 --- a/src/main.zig +++ b/src/main.zig @@ -226,7 +226,6 @@ pub fn mainArgs(gpa: *Allocator, arena: *Allocator, args: []const []const u8) !v { return punt_to_clang(arena, args); } else if (mem.eql(u8, cmd, "ld.lld") or - mem.eql(u8, cmd, "ld64.lld") or mem.eql(u8, cmd, "lld-link") or mem.eql(u8, cmd, "wasm-ld")) { @@ -3384,7 +3383,6 @@ fn punt_to_llvm_ar(arena: *Allocator, args: []const []const u8) error{OutOfMemor /// The first argument determines which backend is invoked. The options are: /// * `ld.lld` - ELF -/// * `ld64.lld` - Mach-O /// * `lld-link` - COFF /// * `wasm-ld` - WebAssembly /// 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 const argc = @intCast(c_int, argv.len); if (mem.eql(u8, args[1], "ld.lld")) { break :rc llvm.LinkELF(argc, argv.ptr, true); - } else if (mem.eql(u8, args[1], "ld64.lld")) { - break :rc llvm.LinkMachO(argc, argv.ptr, true); } else if (mem.eql(u8, args[1], "lld-link")) { break :rc llvm.LinkCOFF(argc, argv.ptr, true); } else if (mem.eql(u8, args[1], "wasm-ld")) { diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp index 8c54af4bb4..6d40f4089a 100644 --- a/src/zig_llvm.cpp +++ b/src/zig_llvm.cpp @@ -1187,11 +1187,6 @@ int ZigLLDLinkELF(int argc, const char **argv, bool can_exit_early) { return lld::elf::link(args, can_exit_early, llvm::outs(), llvm::errs()); } -int ZigLLDLinkMachO(int argc, const char **argv, bool can_exit_early) { - std::vector args(argv, argv + argc); - return lld::mach_o::link(args, can_exit_early, llvm::outs(), llvm::errs()); -} - int ZigLLDLinkWasm(int argc, const char **argv, bool can_exit_early) { std::vector args(argv, argv + argc); return lld::wasm::link(args, can_exit_early, llvm::outs(), llvm::errs()); diff --git a/src/zig_llvm.h b/src/zig_llvm.h index 32a969f70e..a2b3c6b92e 100644 --- a/src/zig_llvm.h +++ b/src/zig_llvm.h @@ -514,7 +514,6 @@ ZIG_EXTERN_C const char *ZigLLVMGetEnvironmentTypeName(enum ZigLLVM_EnvironmentT ZIG_EXTERN_C int ZigLLDLinkCOFF(int argc, const char **argv, bool can_exit_early); ZIG_EXTERN_C int ZigLLDLinkELF(int argc, const char **argv, bool can_exit_early); -ZIG_EXTERN_C int ZigLLDLinkMachO(int argc, const char **argv, bool can_exit_early); ZIG_EXTERN_C int ZigLLDLinkWasm(int argc, const char **argv, bool can_exit_early); ZIG_EXTERN_C bool ZigLLVMWriteArchive(const char *archive_name, const char **file_names, size_t file_name_count,