commit 0b58b617998b79a765b54f88fbe90ca2798b3d3e (tree) parent dc325669e360f7a9dfa24f85a62fa386529dade6 Author: Andrew Kelley <andrew@ziglang.org> Date: Thu, 25 Feb 2021 21:04:23 -0700 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 Diff is too large, output suppressed.