Work around some g++ cpu detection algo bug.

should fix gh-1980
I wouldn't hardcode corei7 here.  You should strip like what was done for the other case.