toolchain/gcc: replace revert with upstream fix