Support i686 without needing to duplicate the i586 over-ride.

Signed-off-by: Andre McCurdy <armccurdy@gmail.com>
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>