linux/arm: identify aarch64 as arm too

So that we correctly parse /proc/cpuinfo

Signed-off-by: Brice Goglin <[email protected]>

Author: bgoglin

hwloc/topology-linux.c

@@ -5781,7 +5781,8 @@ hwloc_gather_system_info(struct hwloc_topology *topology,
 	|| (data->utsname.machine[0] == 'i' && !strcmp(data->utsname.machine+2, "86"))
 	|| !strcmp(data->utsname.machine, "k1om"))
       data->arch = HWLOC_LINUX_ARCH_X86;
-    else if (!strncmp(data->utsname.machine, "arm", 3))
+    else if (!strcmp(data->utsname.machine, "aarch64")
+             || !strncmp(data->utsname.machine, "arm", 3))
       data->arch = HWLOC_LINUX_ARCH_ARM;
     else if (!strncmp(data->utsname.machine, "ppc", 3)
 	     || !strncmp(data->utsname.machine, "power", 5))

tests/hwloc/linux/128arm-2pa2n8cluster4co.console

@@ -1,5 +1,5 @@
 Machine (P#0 total=503GiB DMIProductName="XA320 V2 " DMIProductVersion="To be filled by O.E.M." DMIProductSerial=2102312MEA10K9000003 DMIProductUUID=76cfcdd4-c8a7-9486-e911-c1d00a756a75 DMIBoardVendor=Huawei DMIBoardName=BC82HPNBB DMIBoardVersion=V200R002C00 DMIBoardSerial=026MGF10K8000012 DMIBoardAssetTag="To be filled by O.E.M." DMIChassisVendor=Huawei DMIChassisType=17 DMIChassisVersion="To be filled by O.E.M." DMIChassisSerial="To be filled by O.E.M." DMIChassisAssetTag="To be filled by O.E.M." DMIBIOSVendor="Huawei Corp." DMIBIOSVersion=0.86 DMIBIOSDate=07/19/2019 DMISysVendor=Huawei)
-  Package L#0 (P#36 total=252GiB)
+  Package L#0 (P#36 total=252GiB CPUImplementer=0x48 CPUArchitecture=8 CPUVariant=0x1 CPUPart=0xd01 CPURevision=0)
     L3Cache L#0 (total=126GiB size=32MiB linesize=128 ways=128)
       NUMANode L#0 (P#0 local=126GiB total=126GiB)
       Group0(Cluster) L#0 (P#138)
@@ -340,7 +340,7 @@ Machine (P#0 total=503GiB DMIProductName="XA320 V2 " DMIProductVersion="To be fi
             L1iCache L#63 (size=64KiB linesize=64 ways=4)
               Core L#63 (P#63)
                 PU L#63 (P#63)
-  Package L#1 (P#8442 total=251GiB)
+  Package L#1 (P#8442 total=251GiB CPUImplementer=0x48 CPUArchitecture=8 CPUVariant=0x1 CPUPart=0xd01 CPURevision=0)
     L3Cache L#2 (total=126GiB size=32MiB linesize=128 ways=128)
       NUMANode L#2 (P#2 local=126GiB total=126GiB)
       Group0(Cluster) L#16 (P#8544)