Merge remote-tracking branch 'origin/llvm12'

Happy LLVM 12 Release Day.

Please note that the llvm 12 tag does not include the latest commit in
the release/12.x branch, which is in fact a bug fix for a regression
that is causing a failure in Zig's test suite.

Zig master branch is tracking release/12.x, and will be enabling the
test that is fixed by that commit.

1 files changed, 2 insertions, 2 deletions

diff --git a/src/stage1/zig0.cpp b/src/stage1/zig0.cpp
index bcc9dbc00a..e16f79455a 100644
--- a/src/stage1/zig0.cpp
+++ b/src/stage1/zig0.cpp
@@ -94,6 +94,8 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {
             return OsSolaris;
         case ZigLLVM_Win32:
             return OsWindows;
+        case ZigLLVM_ZOS:
+            return OsZOS;
         case ZigLLVM_Haiku:
             return OsHaiku;
         case ZigLLVM_Minix:
@@ -102,8 +104,6 @@ static Os get_zig_os_type(ZigLLVM_OSType os_type) {
             return OsRTEMS;
         case ZigLLVM_NaCl:
             return OsNaCl;
-        case ZigLLVM_CNK:
-            return OsCNK;
         case ZigLLVM_AIX:
             return OsAIX;
         case ZigLLVM_CUDA: