Update of the gold-plugin.cpp code to match Chandler's changes (r226981)