toolchain/gcc: remove upstreamed patch, add backport