Updated 5-ext-linking patch to match Go tip