None of this is needed in general and what's more, the cpu information is not the only information on which decision int he indirect functions are made. Somehow adding hooks to support just one thing is completely wrong. If you want to support architectures which cannot live with the current situation do something arch-specific.