Fix crash when the user specify an march and Make the arm fix work in that case.