Rollup merge of rust-lang#41152 - cuviper:bootstrap-armv7, r=japaric

bootstrap.py: fix armv7 detection

This matches the logic that was in `./configure` before f8ca805.

Author: TimNN

Diff for: src/bootstrap/bootstrap.py

@@ -472,10 +472,10 @@ def build_triple(self):
             cputype = 'i686'
         elif cputype in {'xscale', 'arm'}:
             cputype = 'arm'
-        elif cputype in {'armv6l', 'armv7l', 'armv8l'}:
+        elif cputype == 'armv6l':
             cputype = 'arm'
             ostype += 'eabihf'
-        elif cputype == 'armv7l':
+        elif cputype in {'armv7l', 'armv8l'}:
             cputype = 'armv7'
             ostype += 'eabihf'
         elif cputype == 'aarch64':