commit 68ed6cc3e8296fa4e5dd79564e47034849d4e08b
author Jonas Devlieghere <jonas@devlieghere.com> Tue Apr 13 18:56:05 2021 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Apr 16 12:25:48 2021 -0700
tree 0e001464b5c505d9eb84062811bd0e09626062d1
parent 1d0d9db3dfd10acbf3ed41b226fd8b41119a3182

[lldb] Pretend host architecture is arm64 on AS

The arm64e architecture is a preview. On Apple Silicon, pretend the host
architecture is arm64.

GitOrigin-RevId: 479b672ff9a9230dee37fad97413a88bc0ab362b

source/Host/macosx/objcxx/HostInfoMacOSX.mm

diff --git a/source/Host/macosx/objcxx/HostInfoMacOSX.mm b/source/Host/macosx/objcxx/HostInfoMacOSX.mm
index 98607a1..7292451 100644
--- a/source/Host/macosx/objcxx/HostInfoMacOSX.mm
+++ b/source/Host/macosx/objcxx/HostInfoMacOSX.mm
@@ -243,6 +243,12 @@
     len = sizeof(is_64_bit_capable);
     ::sysctlbyname("hw.cpu64bit_capable", &is_64_bit_capable, &len, NULL, 0);
 
+    if (cputype == CPU_TYPE_ARM64 && cpusubtype == CPU_SUBTYPE_ARM64E) {
+      // The arm64e architecture is a preview. Pretend the host architecture
+      // is arm64.
+      cpusubtype = CPU_SUBTYPE_ARM64_ALL;
+    }
+
     if (is_64_bit_capable) {
       if (cputype & CPU_ARCH_ABI64) {
         // We have a 64 bit kernel on a 64 bit system