Cross compiler build fix [Important] - from J.Peyton, initial version from C.Bergstrom. llvm-svn: 237360 GitOrigin-RevId: 708fa8e89937f25a3fbb6150d573c771119d3144