--- Reverse-merging r81440 into '.':
U    gcc/llvm-convert.cpp
U    gcc/except.c

Revert the test of Eric's patch.

llvm-svn: 81887