Hi Gerald,
If you are going through that effort, split the source file into two with the routine with computed gotos which has problems with -fgcse in one section, and the rest in another file.
Surgically extracting bits-and-pieces out of an object (.o) file is far more brittle than the above.
HTH, --Eljay