Patches from pf3gnuchains4x.