Following changes are required for a81206f3 * Add -disable-cfi option back. * Change "unnamed_1.eh" to "unnamed_{{.*}}.eh". Similar patch has been applied to release_34 branch already.