This matches the logic that was in `./configure` before
f8ca805422db8.
cputype = 'i686'
elif cputype in {'xscale', 'arm'}:
cputype = 'arm'
cputype = 'i686'
elif cputype in {'xscale', 'arm'}:
cputype = 'arm'
- elif cputype in {'armv6l', 'armv7l', 'armv8l'}:
+ elif cputype == 'armv6l':
cputype = 'arm'
ostype += 'eabihf'
cputype = 'arm'
ostype += 'eabihf'
- elif cputype == 'armv7l':
+ elif cputype in {'armv7l', 'armv8l'}:
cputype = 'armv7'
ostype += 'eabihf'
elif cputype == 'aarch64':
cputype = 'armv7'
ostype += 'eabihf'
elif cputype == 'aarch64':