Skip to content

Commit 4fd446d

Browse files
committed
Remove mention of lldMachO from the project
including: * finding lldMachO in CMake config * punting `ld64.lld` to LLD linker * providing bindings to LLD linker
1 parent d378e0e commit 4fd446d

File tree

5 files changed

+0
-13
lines changed

5 files changed

+0
-13
lines changed

cmake/Findlld.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,12 +496,10 @@ fn LLVMInitializeAllAsmParsers() callconv(.C) void {
496496

497497
extern fn ZigLLDLinkCOFF(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;
498498
extern fn ZigLLDLinkELF(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;
499-
extern fn ZigLLDLinkMachO(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;
500499
extern fn ZigLLDLinkWasm(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;
501500

502501
pub const LinkCOFF = ZigLLDLinkCOFF;
503502
pub const LinkELF = ZigLLDLinkELF;
504-
pub const LinkMachO = ZigLLDLinkMachO;
505503
pub const LinkWasm = ZigLLDLinkWasm;
506504

507505
pub const ObjectFormatType = enum(c_int) {

src/main.zig

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -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

1190-
int 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-
11951190
int 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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,6 @@ ZIG_EXTERN_C const char *ZigLLVMGetEnvironmentTypeName(enum ZigLLVM_EnvironmentT
514514

515515
ZIG_EXTERN_C int ZigLLDLinkCOFF(int argc, const char **argv, bool can_exit_early);
516516
ZIG_EXTERN_C int ZigLLDLinkELF(int argc, const char **argv, bool can_exit_early);
517-
ZIG_EXTERN_C int ZigLLDLinkMachO(int argc, const char **argv, bool can_exit_early);
518517
ZIG_EXTERN_C int ZigLLDLinkWasm(int argc, const char **argv, bool can_exit_early);
519518

520519
ZIG_EXTERN_C bool ZigLLVMWriteArchive(const char *archive_name, const char **file_names, size_t file_name_count,

0 commit comments

Comments
 (0)