diff options
| author | Martin Storsjo <martin@martin.st> | 2019-10-15 08:32:46 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2019-10-15 08:32:46 +0000 |
| commit | 674d55438d25e900dba202078a108836ba066e64 (patch) | |
| tree | 9381a2772e52a0a8a701441157ec3973ea2fe8e3 | |
| parent | b1f6ba2a2ecdf253c1ee2f2a04156eba78cfe3fa (diff) | |
| download | bcm5719-llvm-674d55438d25e900dba202078a108836ba066e64.tar.gz bcm5719-llvm-674d55438d25e900dba202078a108836ba066e64.zip | |
[LLDB] [PECOFF] Use a "pc" vendor name in aarch64 triples
This matches all other architectures listed in the same file.
This fixes debugging aarch64 executables with lldb-server, which
otherwise fails, with log messages like these:
Target::SetArchitecture changing architecture to aarch64 (aarch64-pc-windows-msvc)
Target::SetArchitecture Trying to select executable file architecture aarch64 (aarch64-pc-windows-msvc)
ArchSpec::SetArchitecture sets the vendor to llvm::Triple::PC
for any coff/win32 combination, and if this doesn't match the triple
set by the PECOFF module, things doesn't seem to work with when
using lldb-server.
Differential Revision: https://reviews.llvm.org/D68939
llvm-svn: 374867
| -rw-r--r-- | lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp | 2 | ||||
| -rw-r--r-- | lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp index eee98491a88..742b28d0aaf 100644 --- a/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp +++ b/lldb/source/Plugins/ObjectFile/PECOFF/ObjectFilePECOFF.cpp @@ -200,7 +200,7 @@ size_t ObjectFilePECOFF::GetModuleSpecifications( specs.Append(module_spec); break; case MachineArm64: - spec.SetTriple("aarch64-unknown-windows"); + spec.SetTriple("aarch64-pc-windows"); specs.Append(module_spec); break; default: diff --git a/lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml b/lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml index 1fcf3b35a8d..d8af44253b5 100644 --- a/lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml +++ b/lldb/test/Shell/ObjectFile/PECOFF/basic-info-arm64.yaml @@ -2,7 +2,7 @@ # RUN: lldb-test object-file %t | FileCheck %s # CHECK: Plugin name: pe-coff -# CHECK: Architecture: aarch64-unknown-windows-msvc +# CHECK: Architecture: aarch64-pc-windows-msvc # CHECK: UUID: # CHECK: Executable: true # CHECK: Stripped: false |
