This also solves the problem that specifying x96-64 as generic optimisation works for -march=x86-64 but not for -mtune. (cherry picked from commit 2ca76511)