Update to compile with LLVM-3.5svn