Port the locale changes to the other gcc versions as well