Use both OS and Architecture to choose correct ABI

[abhishek.aggarwal]

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 <[e-mail]>

[jasonmolenda]

On Mac OS X there's these "simulator" processes used for debugging iOS apps on the Mac. They are native i386/x86_64 code, they use the native Mac OS X ABI, but they link against different libraries so it behaves like an iOS device. These processes will have an architecture like i386-apple-ios. So I'd also allow for arch.GetTriple().isiOS() to activate this plugin.

[abhishek.aggarwal]

If I understood you correctly, you want to add arch.GetTriple().isiOS() also along with arch.GetTriple().isMacOSX(). Am I right ? If yes then I will do it.

[clayborg]

Add iOS as well as noted in the inline comment.

source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp

240

add

arch.GetTriple().isIOS()

as well

[abhishek.aggarwal]

Followed up on Jason's comments

• Added check for the presence of iOS

[clayborg]

looks good.

source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp

 
 //------------------------------------------------------------------
 // Static Functions
 //------------------------------------------------------------------
 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);
         return g_abi_sp;
     }
     return ABISP();
 }