Commit 8d2c8a6d authored by Tom Stellard's avatar Tom Stellard
Browse files

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
------------------------------------------------------------------------

llvm-svn: 232574
parent e0cba6fb

lldb/source/Core/Module.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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