Merge remote-tracking branch 'origin/master' into llvm13

Conflicts:

 * cmake/Findclang.cmake
 * cmake/Findlld.cmake
 * cmake/Findllvm.cmake

In master branch, more search paths were added to these files with "12"
in the path. In this commit I updated them to "13".

 * src/stage1/codegen.cpp
 * src/zig_llvm.cpp
 * src/zig_llvm.h

In master branch, ZigLLVMBuildCmpXchg is improved to add
`is_single_threaded`. However, the LLVM 13 C API has this already, and
in the llvm13 branch, ZigLLVMBuildCmpXchg is deleted in favor of the C
API. In this commit I updated stage2 to use the LLVM 13 C API rather
than depending on an improved ZigLLVMBuildCmpXchg.

Additionally, src/target.zig largestAtomicBits needed to be updated to
include the new m68k ISA.

1 files changed, 7 insertions, 1 deletions

diff --git a/tools/update_clang_options.zig b/tools/update_clang_options.zig
index 04cdbf44de..407e813ef3 100644
--- a/tools/update_clang_options.zig
+++ b/tools/update_clang_options.zig
@@ -473,7 +473,13 @@ pub fn main() anyerror!void {
     try stdout.writeAll(
         \\// This file is generated by tools/update_clang_options.zig.
         \\// zig fmt: off
-        \\usingnamespace @import("clang_options.zig");
+        \\const clang_options = @import("clang_options.zig");
+        \\const CliArg = clang_options.CliArg;
+        \\const flagpd1 = clang_options.flagpd1;
+        \\const flagpsl = clang_options.flagpsl;
+        \\const joinpd1 = clang_options.joinpd1;
+        \\const jspd1 = clang_options.jspd1;
+        \\const sepd1 = clang_options.sepd1;
         \\pub const data = blk: { @setEvalBranchQuota(6000); break :blk &[_]CliArg{
         \\
     );