[Lldb-commits] [lldb] r241441 - Use both OS and Architecture to choose correct ABI

[Abhishek Aggarwal]

Author: abhishek
Date: Mon Jul  6 07:49:47 2015
New Revision: 241441

URL: http://llvm.org/viewvc/llvm-project?rev=241441&view=rev
Log:
Use both OS and Architecture to choose correct ABI

Summary:
   - In ABIMacOSX_i386.cpp:
        -- Earlier, only Triple:Arch was used to choose ABI
        -- Now, Triple:OS is also used along with Triple:Arch

   - Resolves PR-23718

Change-Id: Id8b1d86dda763241f9e594a1c71252555939af1e
Signed-off-by: Abhishek Aggarwal <abhishek.a.aggarwal at intel.com>

Reviewers: jasonmolenda, clayborg

Subscribers: lldb-commits

Differential Revision: http://reviews.llvm.org/D10308

Modified:
    lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp

Modified: lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp?rev=241441&r1=241440&r2=241441&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp (original)
+++ lldb/trunk/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp Mon Jul  6 07:49:47 2015
@@ -236,7 +236,8 @@ ABISP
 ABIMacOSX_i386::CreateInstance (const ArchSpec &arch)
 {
     static ABISP g_abi_sp;
-     if (arch.GetTriple().getArch() == llvm::Triple::x86)
+     if ((arch.GetTriple().getArch() == llvm::Triple::x86) &&
+          (arch.GetTriple().isMacOSX() || arch.GetTriple().isiOS()))
      {
         if (!g_abi_sp)
             g_abi_sp.reset (new ABIMacOSX_i386);