diff options
| author | Jason Molenda <jmolenda@apple.com> | 2015-06-25 22:37:57 +0000 |
|---|---|---|
| committer | Jason Molenda <jmolenda@apple.com> | 2015-06-25 22:37:57 +0000 |
| commit | d607afd1484e8a5c642a91b8df140240dc4ccaab (patch) | |
| tree | bf93b20dc69a9893385372b98dacd517a125dc0d /lldb/source/Core/ArchSpec.cpp | |
| parent | c9a2f6efd4820614f4991af810a7bad5d0ede8ef (diff) | |
| download | bcm5719-llvm-d607afd1484e8a5c642a91b8df140240dc4ccaab.tar.gz bcm5719-llvm-d607afd1484e8a5c642a91b8df140240dc4ccaab.zip | |
Mark armv7em and armv7m as compatible architectures.
<rdar://problem/21244671>
llvm-svn: 240713
Diffstat (limited to 'lldb/source/Core/ArchSpec.cpp')
| -rw-r--r-- | lldb/source/Core/ArchSpec.cpp | 32 |
1 files changed, 31 insertions, 1 deletions
diff --git a/lldb/source/Core/ArchSpec.cpp b/lldb/source/Core/ArchSpec.cpp index 562c99308fd..33cbede9ce1 100644 --- a/lldb/source/Core/ArchSpec.cpp +++ b/lldb/source/Core/ArchSpec.cpp @@ -1091,6 +1091,8 @@ cores_match (const ArchSpec::Core core1, const ArchSpec::Core core2, bool try_in try_inverse = false; if (core2 == ArchSpec::eCore_arm_armv7) return true; + if (core2 == ArchSpec::eCore_arm_armv6m) + return true; } break; @@ -1099,8 +1101,36 @@ cores_match (const ArchSpec::Core core1, const ArchSpec::Core core2, bool try_in return true; break; - case ArchSpec::eCore_arm_armv7m: case ArchSpec::eCore_arm_armv7em: + if (!enforce_exact_match) + { + if (core2 == ArchSpec::eCore_arm_generic) + return true; + if (core2 == ArchSpec::eCore_arm_armv7m) + return true; + if (core2 == ArchSpec::eCore_arm_armv6m) + return true; + if (core2 == ArchSpec::eCore_arm_armv7) + return true; + try_inverse = true; + } + break; + + case ArchSpec::eCore_arm_armv7m: + if (!enforce_exact_match) + { + if (core2 == ArchSpec::eCore_arm_generic) + return true; + if (core2 == ArchSpec::eCore_arm_armv6m) + return true; + if (core2 == ArchSpec::eCore_arm_armv7) + return true; + if (core2 == ArchSpec::eCore_arm_armv7em) + return true; + try_inverse = true; + } + break; + case ArchSpec::eCore_arm_armv7f: case ArchSpec::eCore_arm_armv7k: case ArchSpec::eCore_arm_armv7s: |
