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, 2 insertions, 2 deletions

diff --git a/lib/std/json.zig b/lib/std/json.zig
index ce9ed9af7d..e8f9d9d395 100644
--- a/lib/std/json.zig
+++ b/lib/std/json.zig
@@ -1405,7 +1405,7 @@ fn parsedEqual(a: anytype, b: @TypeOf(a)) bool {
             if (a == null or b == null) return false;
             return parsedEqual(a.?, b.?);
         },
-        .Union => {
+        .Union => |info| {
             if (info.tag_type) |UnionTag| {
                 const tag_a = std.meta.activeTag(a);
                 const tag_b = std.meta.activeTag(b);
@@ -2657,7 +2657,7 @@ test "json.parser.dynamic" {
     try testing.expect(mem.eql(u8, large_int.NumberString, "18446744073709551615"));
 }
 
-test "import more json tests" {
+test {
     _ = @import("json/test.zig");
     _ = @import("json/write_stream.zig");
 }