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

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

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

Visibility: public

Requested revision: 0b58b617998b79a765b54f88fbe90ca2798b3d3e

Requested commit: 0b58b617998b79a765b54f88fbe90ca2798b3d3e

Commit: 0b58b617998b79a765b54f88fbe90ca2798b3d3e

Tree: ca6cc4b6bcc2b93166d196049ee49416afe781ad

Author: Andrew Kelley

Committer: Andrew Kelley

## Message

```
Merge remote-tracking branch 'origin/master' into llvm12

Conflicts:
 * src/clang.zig
 * src/llvm.zig
   - this file got moved to src/llvm/bindings.zig in master branch so I
     had to put the new LLVM arch/os enum tags into it.
 * lib/std/target.zig, src/stage1/target.cpp
   - haiku had an inconsistency with its default target ABI, gnu vs
     eabi. In this commit we make it gnu in both places to match the
     latest changes by @hoanga.
 * src/translate_c.zig

```

## Parents

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

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

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