vendor/lldb/lldb-r202189

1 files changed, 6 insertions, 16 deletions

diff --git a/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp b/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
index f360a182e065..8596381b3cbc 100644
--- a/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
+++ b/source/Plugins/ABI/MacOSX-i386/ABIMacOSX_i386.cpp
@@ -235,22 +235,12 @@ ABIMacOSX_i386::GetRedZoneSize () const
 ABISP
 ABIMacOSX_i386::CreateInstance (const ArchSpec &arch)
 {
-    static ABISP g_abi_mac_sp;
-    static ABISP g_abi_other_sp;
-    if (arch.GetTriple().getArch() == llvm::Triple::x86)
-    {
-        if (arch.GetTriple().isOSDarwin())
-        {
-            if (!g_abi_mac_sp)
-                g_abi_mac_sp.reset (new ABIMacOSX_i386(true));
-            return g_abi_mac_sp;
-        }
-        else
-        {
-            if (!g_abi_other_sp)
-                g_abi_other_sp.reset (new ABIMacOSX_i386(false));
-            return g_abi_other_sp;
-        }
+    static ABISP g_abi_sp;
+     if (arch.GetTriple().getArch() == llvm::Triple::x86)
+     {
+        if (!g_abi_sp)
+            g_abi_sp.reset (new ABIMacOSX_i386);
+        return g_abi_sp;
     }
     return ABISP();
 }