update for llvm 3.2: master branch

This pull request is for master branch