Skip to content

Commit 48feef2

Browse files
committed
[lldb] Treat ARM64X images as ARM64.
With D149091, ARM64X binaries are no longer reported as ARM64. This broke lldb tests as Windows 11 system DLLs are mostly ARM64X binaries and lldb doesn't know how to handle them. Ideally lldb would understand a bit more about ARM64X and handle them as AMD64 in x64 processes, but this is enough to preserve previous behavior and fix tests. Reviewed By: mstorsjo Differential Revision: https://reviews.llvm.org/D156268
1 parent 25b8433 commit 48feef2

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -343,6 +343,7 @@ size_t ObjectFilePECOFF::GetModuleSpecifications(
343343
specs.Append(module_spec);
344344
break;
345345
case MachineArm64:
346+
case MachineArm64X:
346347
spec.SetTriple("aarch64-pc-windows");
347348
spec.GetTriple().setEnvironment(env);
348349
specs.Append(module_spec);

lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ class ObjectFilePECOFF : public lldb_private::ObjectFile {
2424
MachineArm = 0x1c0,
2525
MachineArmNt = 0x1c4,
2626
MachineArm64 = 0xaa64,
27+
MachineArm64X = 0xa64e,
2728
MachineEbc = 0xebc,
2829
MachineX86 = 0x14c,
2930
MachineIA64 = 0x200,

0 commit comments

Comments
 (0)