Looks fine to me, largely mechanical. Please send a heads-up to the list calling this out so that people maintaining out-of-tree targets will know about the API change. http://llvm-reviews.chandlerc.com/D776