Merge pull request #692 from Trass3r/master

fix for llvm trunk
Add missing LLVM 3.5 intrinsic and add support for LLVM 3.6.