Author: tstellar Date: Tue Mar 17 19:37:37 2015 New Revision: 232574 URL: http://llvm.org/viewvc/llvm-project?rev=232574&view=rev Log: Merging r230694: ------------------------------------------------------------------------ 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 ------------------------------------------------------------------------ Modified: lldb/branches/release_35/ (props changed) lldb/branches/release_35/source/Core/Module.cpp Propchange: lldb/branches/release_35/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Tue Mar 17 19:37:37 2015 @@ -1,3 +1,3 @@ /lldb/branches/apple/python-GIL:156467-162159 /lldb/branches/iohandler:198360-200250 -/lldb/trunk:214291 +/lldb/trunk:214291,230694 Modified: lldb/branches/release_35/source/Core/Module.cpp URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_35/source/Core/Module.cpp?rev=232574&r1=232573&r2=232574&view=diff ============================================================================== --- lldb/branches/release_35/source/Core/Module.cpp (original) +++ lldb/branches/release_35/source/Core/Module.cpp Tue Mar 17 19:37:37 2015 @@ -1590,7 +1590,7 @@ Module::SetArchitecture (const ArchSpec m_arch = new_arch; return true; } - return m_arch.IsExactMatch(new_arch); + return m_arch.IsCompatibleMatch(new_arch); } bool _______________________________________________ llvm-branch-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/llvm-branch-commits
