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()...@@ -42,7 +42,6 @@ else()
42 FIND_AND_ADD_LLD_LIB(lldMinGW)42 FIND_AND_ADD_LLD_LIB(lldMinGW)
43 FIND_AND_ADD_LLD_LIB(lldELF)43 FIND_AND_ADD_LLD_LIB(lldELF)
44 FIND_AND_ADD_LLD_LIB(lldCOFF)44 FIND_AND_ADD_LLD_LIB(lldCOFF)
45 FIND_AND_ADD_LLD_LIB(lldMachO)
46 FIND_AND_ADD_LLD_LIB(lldWasm)45 FIND_AND_ADD_LLD_LIB(lldWasm)
47 FIND_AND_ADD_LLD_LIB(lldReaderWriter)46 FIND_AND_ADD_LLD_LIB(lldReaderWriter)
48 FIND_AND_ADD_LLD_LIB(lldCore)47 FIND_AND_ADD_LLD_LIB(lldCore)
src/codegen/llvm/bindings.zig-2
...@@ -496,12 +496,10 @@ fn LLVMInitializeAllAsmParsers() callconv(.C) void {...@@ -496,12 +496,10 @@ fn LLVMInitializeAllAsmParsers() callconv(.C) void {
496496
497extern fn ZigLLDLinkCOFF(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;497extern fn ZigLLDLinkCOFF(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;
498extern fn ZigLLDLinkELF(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;498extern 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;
500extern fn ZigLLDLinkWasm(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;499extern fn ZigLLDLinkWasm(argc: c_int, argv: [*:null]const ?[*:0]const u8, can_exit_early: bool) c_int;
501500
502pub const LinkCOFF = ZigLLDLinkCOFF;501pub const LinkCOFF = ZigLLDLinkCOFF;
503pub const LinkELF = ZigLLDLinkELF;502pub const LinkELF = ZigLLDLinkELF;
504pub const LinkMachO = ZigLLDLinkMachO;
505pub const LinkWasm = ZigLLDLinkWasm;503pub const LinkWasm = ZigLLDLinkWasm;
506504
507pub const ObjectFormatType = enum(c_int) {505pub 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...@@ -226,7 +226,6 @@ pub fn mainArgs(gpa: *Allocator, arena: *Allocator, args: []const []const u8) !v
226 {226 {
227 return punt_to_clang(arena, args);227 return punt_to_clang(arena, args);
228 } else if (mem.eql(u8, cmd, "ld.lld") or228 } else if (mem.eql(u8, cmd, "ld.lld") or
229 mem.eql(u8, cmd, "ld64.lld") or
230 mem.eql(u8, cmd, "lld-link") or229 mem.eql(u8, cmd, "lld-link") or
231 mem.eql(u8, cmd, "wasm-ld"))230 mem.eql(u8, cmd, "wasm-ld"))
232 {231 {
...@@ -3384,7 +3383,6 @@ fn punt_to_llvm_ar(arena: *Allocator, args: []const []const u8) error{OutOfMemor...@@ -3384,7 +3383,6 @@ fn punt_to_llvm_ar(arena: *Allocator, args: []const []const u8) error{OutOfMemor
33843383
3385/// The first argument determines which backend is invoked. The options are:3384/// The first argument determines which backend is invoked. The options are:
3386/// * `ld.lld` - ELF3385/// * `ld.lld` - ELF
3387/// * `ld64.lld` - Mach-O
3388/// * `lld-link` - COFF3386/// * `lld-link` - COFF
3389/// * `wasm-ld` - WebAssembly3387/// * `wasm-ld` - WebAssembly
3390/// TODO https://github.com/ziglang/zig/issues/32573388/// 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...@@ -3402,8 +3400,6 @@ pub fn punt_to_lld(arena: *Allocator, args: []const []const u8) error{OutOfMemor
3402 const argc = @intCast(c_int, argv.len);3400 const argc = @intCast(c_int, argv.len);
3403 if (mem.eql(u8, args[1], "ld.lld")) {3401 if (mem.eql(u8, args[1], "ld.lld")) {
3404 break :rc llvm.LinkELF(argc, argv.ptr, true);3402 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);
3407 } else if (mem.eql(u8, args[1], "lld-link")) {3403 } else if (mem.eql(u8, args[1], "lld-link")) {
3408 break :rc llvm.LinkCOFF(argc, argv.ptr, true);3404 break :rc llvm.LinkCOFF(argc, argv.ptr, true);
3409 } else if (mem.eql(u8, args[1], "wasm-ld")) {3405 } 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) {...@@ -1187,11 +1187,6 @@ int ZigLLDLinkELF(int argc, const char **argv, bool can_exit_early) {
1187 return lld::elf::link(args, can_exit_early, llvm::outs(), llvm::errs());1187 return lld::elf::link(args, can_exit_early, llvm::outs(), llvm::errs());
1188}1188}
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
1195int ZigLLDLinkWasm(int argc, const char **argv, bool can_exit_early) {1190int ZigLLDLinkWasm(int argc, const char **argv, bool can_exit_early) {
1196 std::vector<const char *> args(argv, argv + argc);1191 std::vector<const char *> args(argv, argv + argc);
1197 return lld::wasm::link(args, can_exit_early, llvm::outs(), llvm::errs());1192 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...@@ -514,7 +514,6 @@ ZIG_EXTERN_C const char *ZigLLVMGetEnvironmentTypeName(enum ZigLLVM_EnvironmentT
514514
515ZIG_EXTERN_C int ZigLLDLinkCOFF(int argc, const char **argv, bool can_exit_early);515ZIG_EXTERN_C int ZigLLDLinkCOFF(int argc, const char **argv, bool can_exit_early);
516ZIG_EXTERN_C int ZigLLDLinkELF(int argc, const char **argv, bool can_exit_early);516ZIG_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);
518ZIG_EXTERN_C int ZigLLDLinkWasm(int argc, const char **argv, bool can_exit_early);517ZIG_EXTERN_C int ZigLLDLinkWasm(int argc, const char **argv, bool can_exit_early);
519518
520ZIG_EXTERN_C bool ZigLLVMWriteArchive(const char *archive_name, const char **file_names, size_t file_name_count,519ZIG_EXTERN_C bool ZigLLVMWriteArchive(const char *archive_name, const char **file_names, size_t file_name_count,