zig

commit 66d6930b5c023deb65ea23eb0c4c5029b50b40a3 (tree)
parent bef140c0a2710f77a4ee0e432ce2dbecf690461c
Author: Timon Kruiper <timonkruiper@gmail.com>
Date:   Tue, 10 Nov 2020 01:40:46 +0100

Allow Zig to be built with clang 11 and -Werror

This was brought to the horizon when using zig-bootstrap to cross compile
Zig for windows-gnu.

Diffstat:
M
src/stage1/os.cpp
 | 
13
-------------
M
src/zig_llvm.cpp
 | 
4
++++

2 files changed, 4 insertions(+), 13 deletions(-)
diff --git a/src/stage1/os.cpp b/src/stage1/os.cpp
@@ -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));
diff --git a/src/zig_llvm.cpp b/src/zig_llvm.cpp
@@ -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();