[llvm-branch-commits] [lldb] r235306 - Merging r230694:

[Tom Stellard]

Author: tstellar
Date: Mon Apr 20 09:02:17 2015
New Revision: 235306

URL: http://llvm.org/viewvc/llvm-project?rev=235306&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_36/source/Core/Module.cpp

Modified: lldb/branches/release_36/source/Core/Module.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/branches/release_36/source/Core/Module.cpp?rev=235306&r1=235305&r2=235306&view=diff
==============================================================================
--- lldb/branches/release_36/source/Core/Module.cpp (original)
+++ lldb/branches/release_36/source/Core/Module.cpp Mon Apr 20 09:02:17 2015
@@ -1607,7 +1607,7 @@ Module::SetArchitecture (const ArchSpec
         m_arch = new_arch;
         return true;
     }    
-    return m_arch.IsExactMatch(new_arch);
+    return m_arch.IsCompatibleMatch(new_arch);
 }
 
 bool