Rollup merge of rust-lang#29045 - mseri:patch-4, r=nrc

r? @nrc

Nothing special going on, the only real notable change is the explicit ABI on line 6183. 
I re-onlined some extern on top of the file by hand.

Author: Manishearth