remove ppc and s390 from the host_arch list

We only support ppc64 and s390x.

Change-Id: I1ec46bbfc0bdd266b84336e5af46b0503efd4751
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/7100932
Auto-Submit: Milad Farazmand <mfarazma@ibm.com>
Commit-Queue: Gavin Mak <gavinmak@google.com>
Reviewed-by: Gavin Mak <gavinmak@google.com>
Reviewed-by: Brian Ryner <bryner@google.com>

detect_host_arch.py

@@ -29,15 +29,13 @@ def HostArch():
     elif host_arch.startswith('mips'):
         host_arch = 'mips'
     elif host_arch.startswith('ppc') or host_processor == 'powerpc':
-        host_arch = 'ppc'
-    elif host_arch.startswith('s390'):
-        host_arch = 's390'
+        host_arch = 'ppc64'
+    elif host_arch.startswith('s390') or platform.system() == 'OS/390':
+        host_arch = 's390x'
     elif host_arch.startswith('riscv'):
         host_arch = 'riscv64'
     elif host_arch.startswith('loongarch64'):
         host_arch = 'loong64'
-    elif platform.system() == 'OS/390':
-        host_arch = 's390x'
 
     if host_arch == 'arm64':
         host_platform = platform.architecture()

tests/detect_host_arch_test.py

@@ -38,9 +38,9 @@ class DetectHostArchTest(unittest.TestCase):
             ('arm64', 'ARMv8 (64-bit) Family', ['32bit', 'WindowsPE'], 'x64'),
             ('mips64', '', [''], 'mips64'),
             ('mips', '', [''], 'mips'),
-            ('ppc', '', [''], 'ppc'),
-            ('foo', 'powerpc', [''], 'ppc'),
-            ('s390', '', [''], 's390'),
+            ('ppc64', '', [''], 'ppc64'),
+            ('foo', 'powerpc', [''], 'ppc64'),
+            ('s390x', '', [''], 's390x'),
         ]
 
         for machine, processor, arch, expected in test_cases: