rustc: yet more arch-specific fallout from 2db3abd