Reintroduce support for -std* and -m32