Backport an LLVM fix to close #9117

I created a new branch  rust-llvm-2013-09-11 in my llvm repo to mark this momentous occasion