[Lldb-commits] [lldb] r203207 - Todd points out that my change to ProcessElfCore is probably

[Jason Molenda]

Author: jmolenda
Date: Fri Mar  7 00:28:29 2014
New Revision: 203207

URL: http://llvm.org/viewvc/llvm-project?rev=203207&view=rev
Log:
Todd points out that my change to ProcessElfCore is probably
not going to key off of the ELF object file like I'd intended.
Revert my change in r203205; also revert Greg's change in
r203107 which builds ProcessElfCore on non-Linux/FreeBSD systems
for the moment until we can straighten this out.

Modified:
    lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.cpp
    lldb/trunk/source/lldb.cpp

Modified: lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.cpp?rev=203207&r1=203206&r2=203207&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.cpp (original)
+++ lldb/trunk/source/Plugins/Process/elf-core/ProcessElfCore.cpp Fri Mar  7 00:28:29 2014
@@ -70,13 +70,9 @@ ProcessElfCore::CanDebug(Target &target,
                                                   NULL, NULL, NULL));
         if (m_core_module_sp)
         {
-            const llvm::Triple &triple_ref = m_core_module_sp->GetArchitecture().GetTriple();
-            if (triple_ref.getEnvironment() == llvm::Triple::ELF)
-            {
-                ObjectFile *core_objfile = m_core_module_sp->GetObjectFile();
-                if (core_objfile && core_objfile->GetType() == ObjectFile::eTypeCoreFile)
-                    return true;
-            }
+            ObjectFile *core_objfile = m_core_module_sp->GetObjectFile();
+            if (core_objfile && core_objfile->GetType() == ObjectFile::eTypeCoreFile)
+                return true;
         }
     }
     return false;

Modified: lldb/trunk/source/lldb.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/lldb.cpp?rev=203207&r1=203206&r2=203207&view=diff
==============================================================================
--- lldb/trunk/source/lldb.cpp (original)
+++ lldb/trunk/source/lldb.cpp Fri Mar  7 00:28:29 2014
@@ -125,7 +125,9 @@ lldb_private::Initialize ()
         OperatingSystemPython::Initialize();
 #endif
         JITLoaderGDB::Initialize();
+#if defined(__linux__) || defined(__FreeBSD__)
         ProcessElfCore::Initialize();
+#endif
         
 #if defined (__APPLE__)
         //----------------------------------------------------------------------
@@ -209,7 +211,9 @@ lldb_private::Terminate ()
     OperatingSystemPython::Terminate();
 #endif
     JITLoaderGDB::Terminate();
+#if defined(__linux__) || defined(__FreeBSD__)
     ProcessElfCore::Terminate();
+#endif
     
 #if defined (__APPLE__)
     DynamicLoaderMacOSXDYLD::Terminate();