2nd attempt on the latest LLVM 3.3 changes.

The previous commit only worked on Windows.