Fix MSYS2 GCC-4.8.0 patch (Part3)