There's an element of guesswork involved in the GCC updates but it seems better than what was there before. llvm-svn: 207912
