Architecture: Report 32bit Windows as Windows-i586 instead of -i486