Update for llvm-3.2