diff options
| author | Tom Stellard <thomas.stellard@amd.com> | 2015-03-18 00:37:37 +0000 |
|---|---|---|
| committer | Tom Stellard <thomas.stellard@amd.com> | 2015-03-18 00:37:37 +0000 |
| commit | 8d2c8a6d2295d6a49ad471526058a69dd3d2d006 (patch) | |
| tree | bd5198640f99d503915f74c284b24aab5b8788cb | |
| parent | e0cba6fbc2045cf0e403c4f22b7dd0849699b91a (diff) | |
| download | llvm-release/3.5.x.tar.gz | |
Merging r230694:llvmorg-3.5.2-rc1llvmorg-3.5.2release/3.5.x
------------------------------------------------------------------------
r230694 | chaoren | 2015-02-26 14:15:16 -0800 (Thu, 26 Feb 2015) | 16 lines
Fix Bug 20400
Summary:
http://llvm.org/bugs/show_bug.cgi?id=20400
The default triple of i686-pc-linux-gnu for 32 bit linux targets is compatible
but not necessarily identical to the inferior binaries.
Applying Azat Khuzhin's solution of using ArchSpec::IsCompatibleMatch() instead
of ArchSpec::IsExactMatch() when comparing ObjectFile and Modules architecture.
Reviewers: vharron
Subscribers: lldb-commits
Differential Revision: http://reviews.llvm.org/D7897
------------------------------------------------------------------------
llvm-svn: 232574
| -rw-r--r-- | lldb/source/Core/Module.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lldb/source/Core/Module.cpp b/lldb/source/Core/Module.cpp index b043857cc8de..490108e66591 100644 --- a/lldb/source/Core/Module.cpp +++ b/lldb/source/Core/Module.cpp @@ -1590,7 +1590,7 @@ Module::SetArchitecture (const ArchSpec &new_arch) m_arch = new_arch; return true; } - return m_arch.IsExactMatch(new_arch); + return m_arch.IsCompatibleMatch(new_arch); } bool |