Reapply r135457. This needs llvm-gcc change, that I forgot to check-in yesterday.