It's probably also fixed in upstream qemu master since I haven't deliberately put anything in to qemu-linaro to fix it -- we've almost certainly just picked up the fix from upstream.
Incidentally "-M versatilepb -cpu arm1136-r2" is veering slightly into "unsupported" territory, since there's no such thing as a VersatilePB board with an 1136 CPU in the real world. And did you really want arm1136-r2? That's an r0p2, whereas "arm1136" is the newer r1pX which is probably what the RPi is actually using. (Yes, qemu's names for these two CPU types are hopelessly confusing. Sorry.)
It's probably also fixed in upstream qemu master since I haven't deliberately put anything in to qemu-linaro to fix it -- we've almost certainly just picked up the fix from upstream.
Incidentally "-M versatilepb -cpu arm1136-r2" is veering slightly into "unsupported" territory, since there's no such thing as a VersatilePB board with an 1136 CPU in the real world. And did you really want arm1136-r2? That's an r0p2, whereas "arm1136" is the newer r1pX which is probably what the RPi is actually using. (Yes, qemu's names for these two CPU types are hopelessly confusing. Sorry.)