authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-23 17:28:13-05:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2020-01-23 17:28:13-05:00
log79fb48601749f93541800cff82f3506931dd433c
tree84297b7bfe5ebc702d59c31db06d578944631c3f
parent72589dbffe886cbfc81e1bdaa1825593224007c9
signature Commit is signed but in an unrecognized format.

link: update to llvm 10 API

3 files changed, 13 insertions(+), 10 deletions(-)

src/link.cpp+7-2
......@@ -1894,9 +1894,14 @@ static void link_diag_callback(void *context, const char *ptr, size_t len) {
18941894 buf_append_mem(diag, ptr, len);
18951895}
18961896
1897static bool zig_lld_link(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_count, Buf *diag) {
1897static bool zig_lld_link(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_count,
1898 Buf *diag)
1899{
1900 Buf *stdout_diag = buf_alloc();
18981901 buf_resize(diag, 0);
1899 return ZigLLDLink(oformat, args, arg_count, link_diag_callback, diag);
1902 bool result = ZigLLDLink(oformat, args, arg_count, link_diag_callback, stdout_diag, diag);
1903 buf_destroy(stdout_diag);
1904 return result;
19001905}
19011906
19021907static void add_uefi_link_args(LinkJob *lj) {
src/zig_llvm.cpp+4-5
......@@ -1077,14 +1077,13 @@ bool ZigLLVMWriteArchive(const char *archive_name, const char **file_names, size
10771077
10781078
10791079bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_count,
1080 void (*append_diagnostic_stdout)(void *, const char *, size_t),
1081 void (*append_diagnostic_stderr)(void *, const char *, size_t),
1082 void *context)
1080 void (*append_diagnostic)(void *, const char *, size_t),
1081 void *context_stdout, void *context_stderr)
10831082{
10841083 ArrayRef<const char *> array_ref_args(args, arg_count);
10851084
1086 MyOStream diag_stdout(append_diagnostic_stdout, context);
1087 MyOStream diag_stderr(append_diagnostic_stderr, context);
1085 MyOStream diag_stdout(append_diagnostic, context_stdout);
1086 MyOStream diag_stderr(append_diagnostic, context_stderr);
10881087
10891088 switch (oformat) {
10901089 case ZigLLVM_UnknownObjectFormat:
src/zig_llvm.h+2-3
......@@ -532,9 +532,8 @@ ZIG_EXTERN_C const char *ZigLLVMGetOSTypeName(enum ZigLLVM_OSType os);
532532ZIG_EXTERN_C const char *ZigLLVMGetEnvironmentTypeName(enum ZigLLVM_EnvironmentType abi);
533533
534534ZIG_EXTERN_C bool ZigLLDLink(enum ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_count,
535 void (*append_diagnostic_stdout)(void *, const char *, size_t),
536 void (*append_diagnostic_stderr)(void *, const char *, size_t),
537 void *context);
535 void (*append_diagnostic)(void *, const char *, size_t),
536 void *context_stdout, void *context_stderr);
538537
539538ZIG_EXTERN_C bool ZigLLVMWriteArchive(const char *archive_name, const char **file_names, size_t file_name_count,
540539 enum ZigLLVM_OSType os_type);