Makefile: use correct GCC 4.8 fixes