Port to llvm-3.2