Author: Jason Molenda Date: 2021-04-15T01:30:51-07:00 New Revision: 01ad95ff2a7cc127eddf3832693bbd5c6c54f9ef
URL: https://github.com/llvm/llvm-project/commit/01ad95ff2a7cc127eddf3832693bbd5c6c54f9ef DIFF: https://github.com/llvm/llvm-project/commit/01ad95ff2a7cc127eddf3832693bbd5c6c54f9ef.diff LOG: Mark armv6m compat with armv7em; match armv7em being compat with armv6m armv7em and armv6m in ArchSpec cores_match() will return true. There was a small bug where the reverse order would not return true. rdar://76387176 Added: Modified: lldb/source/Utility/ArchSpec.cpp Removed: ################################################################################ diff --git a/lldb/source/Utility/ArchSpec.cpp b/lldb/source/Utility/ArchSpec.cpp index 52fbf3551b1a2..90c1bbb4abcc8 100644 --- a/lldb/source/Utility/ArchSpec.cpp +++ b/lldb/source/Utility/ArchSpec.cpp @@ -1122,11 +1122,13 @@ static bool cores_match(const ArchSpec::Core core1, const ArchSpec::Core core2, if (!enforce_exact_match) { if (core2 == ArchSpec::eCore_arm_generic) return true; - try_inverse = false; + if (core2 == ArchSpec::eCore_arm_armv7em) + return true; if (core2 == ArchSpec::eCore_arm_armv7) return true; if (core2 == ArchSpec::eCore_arm_armv6m) return true; + try_inverse = false; } break; _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
