Fix previous MSYS patches for llvmgcc and gcc