# Merge remote-tracking branch 'origin/master' into llvm13 · gitcafe/zig

[View on GitCafe](https://git.cafe/gitcafe/zig/commit/f3ebfcae3882c03da84821abed40167ea07a8c78)

Repository: [gitcafe/zig](https://git.cafe/gitcafe/zig)

Visibility: public

Requested revision: f3ebfcae3882c03da84821abed40167ea07a8c78

Requested commit: f3ebfcae3882c03da84821abed40167ea07a8c78

Commit: f3ebfcae3882c03da84821abed40167ea07a8c78

Tree: f1b759c94cba5b020a9ffb141fc62cb686fc5f04

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
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.

```

## Parents

- [111a2dcf3ad53c0c8ad2c9e7c9bd042b81e90c82](https://git.cafe/gitcafe/zig/commit/111a2dcf3ad53c0c8ad2c9e7c9bd042b81e90c82?format=markdown)

- [0395b35cee8d4082cc40b0dcd0298f797f42309d](https://git.cafe/gitcafe/zig/commit/0395b35cee8d4082cc40b0dcd0298f797f42309d?format=markdown)

[Source at this commit](https://git.cafe/gitcafe/zig/tree/f3ebfcae3882c03da84821abed40167ea07a8c78?format=markdown)