Updates to allow building with LLVM-10.