Port to llvm 3.5