mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-13 21:08:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow Zig to be built with clang 11 and -Werror

Browse Source 
This was brought to the horizon when using zig-bootstrap to cross compile
Zig for windows-gnu.
This commit is contained in:
Timon Kruiper 2020-11-10 01:40:46 +01:00 committed by Andrew Kelley
parent d3f1a4edce
commit b498d26376
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/stage1/os.cpp
View File

@ -682,19 +682,6 @@ static Error copy_open_files(FILE *src_f, FILE *dest_f) {
}
}
#if defined(ZIG_OS_WINDOWS)
static void windows_filetime_to_os_timestamp(FILETIME *ft, OsTimeStamp *mtime) {
mtime->sec = (((ULONGLONG) ft->dwHighDateTime) << 32) + ft->dwLowDateTime;
mtime->nsec = 0;
}
static FILETIME windows_os_timestamp_to_filetime(OsTimeStamp mtime) {
FILETIME result;
result.dwHighDateTime = mtime.sec >> 32;
result.dwLowDateTime = mtime.sec;
return result;
}
#endif
Error os_copy_file(Buf *src_path, Buf *dest_path) {
#if defined(ZIG_OS_WINDOWS)
PathSpace src_path_space = slice_to_prefixed_file_w(buf_to_slice(src_path));

4
src/zig_llvm.cpp
View File

@ -1062,6 +1062,7 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_
case ZigLLVM_UnknownObjectFormat:
case ZigLLVM_XCOFF:
assert(false); // unreachable
break;
case ZigLLVM_COFF:
return lld::coff::link(array_ref_args, false, diag_stdout, diag_stderr);
@ -1074,6 +1075,9 @@ bool ZigLLDLink(ZigLLVM_ObjectFormatType oformat, const char **args, size_t arg_
case ZigLLVM_Wasm:
return lld::wasm::link(array_ref_args, false, diag_stdout, diag_stderr);
default:
break;
}
assert(false); // unreachable
abort();