Makefile: use correct GCC 4.8 fixes (credits to Paul Beeler)