changes for support LLVM trunk