Synchronized binutils patch from contrib, now builds again for me.