summaryrefslogtreecommitdiffstats
path: root/lldb/source/Utility/ArchSpec.cpp
diff options
context:
space:
mode:
authorMartin Storsjo <martin@martin.st>2019-09-24 12:20:52 +0000
committerMartin Storsjo <martin@martin.st>2019-09-24 12:20:52 +0000
commit544c8f48c86cee7c8de5ed5dce99849a8ac72118 (patch)
tree06fb2037fd1dc57ce563375daf6a5de45797824b /lldb/source/Utility/ArchSpec.cpp
parent5bb1525392541ea8034b11f54ba0e6dfe2f55548 (diff)
downloadbcm5719-llvm-544c8f48c86cee7c8de5ed5dce99849a8ac72118.tar.gz
bcm5719-llvm-544c8f48c86cee7c8de5ed5dce99849a8ac72118.zip
[LLDB] Add tests for PECOFF arm architecture identification
Add a test case for the change from SVN r372657, and for the preexisting ARM identification. Add a missing ArchDefinitionEntry for PECOFF/arm64, and tweak the ArmNt case to set the architecture to armv7 (ArmNt never ran on anything lower than that). (This avoids a case where ArchSpec::MergeFrom would override the arch from arm to armv7 and ArchSpec::CoreUpdated would reset the OS to unknown at the same time.) Differential Revision: https://reviews.llvm.org/D67951 llvm-svn: 372741
Diffstat (limited to 'lldb/source/Utility/ArchSpec.cpp')
-rw-r--r--lldb/source/Utility/ArchSpec.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/lldb/source/Utility/ArchSpec.cpp b/lldb/source/Utility/ArchSpec.cpp
index 1f22265d3e7..9907ca9b240 100644
--- a/lldb/source/Utility/ArchSpec.cpp
+++ b/lldb/source/Utility/ArchSpec.cpp
@@ -459,7 +459,9 @@ static const ArchDefinitionEntry g_coff_arch_entries[] = {
{ArchSpec::eCore_thumb, llvm::COFF::IMAGE_FILE_MACHINE_THUMB,
LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu}, // ARMv7
{ArchSpec::eCore_x86_64_x86_64, llvm::COFF::IMAGE_FILE_MACHINE_AMD64,
- LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu} // AMD64
+ LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu}, // AMD64
+ {ArchSpec::eCore_arm_arm64, llvm::COFF::IMAGE_FILE_MACHINE_ARM64,
+ LLDB_INVALID_CPUTYPE, 0xFFFFFFFFu, 0xFFFFFFFFu} // ARM64
};
static const ArchDefinition g_coff_arch_def = {
OpenPOWER on IntegriCloud