Merge pull request #3195 from dago/gccflags