Update for LLVM master (3.5).