Properly updated GCC patch
Manually revert "MAKEFLAGS instead of -j2"