Makefile: use correct GCC 4.7 fixes