diff options
| author | emaste <emaste@FreeBSD.org> | 2014-03-19 13:11:35 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-03-19 13:11:35 +0000 |
| commit | 958843c32b7a29741f2e45996b5b3e89f9e108b0 (patch) | |
| tree | 95ae4ffabc848a86b94be3ad3cd42471cdb66b06 /contrib/llvm/tools/lldb/source/lldb.cpp | |
| parent | 2a9993c246f3a2463ccd6b8786781e5b97a35065 (diff) | |
| download | FreeBSD-src-958843c32b7a29741f2e45996b5b3e89f9e108b0.zip FreeBSD-src-958843c32b7a29741f2e45996b5b3e89f9e108b0.tar.gz | |
MFC r258054: Update LLDB to upstream r194122 snapshot
Inludes minor changes relative to upstream, for compatibility with
FreeBSD's in-tree LLVM 3.3:
- Reverted LLDB r191806, restoring use of previous API.
- Reverted part of LLDB r189317, restoring previous enum names.
- Work around missing LLVM r192504, using previous registerEHFrames API
(limited functionality).
- Removed PlatformWindows header include and init/terminate calls.
Sponsored by: DARPA, AFRL
Diffstat (limited to 'contrib/llvm/tools/lldb/source/lldb.cpp')
| -rw-r--r-- | contrib/llvm/tools/lldb/source/lldb.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/contrib/llvm/tools/lldb/source/lldb.cpp b/contrib/llvm/tools/lldb/source/lldb.cpp index 29c3c0e..07e8188 100644 --- a/contrib/llvm/tools/lldb/source/lldb.cpp +++ b/contrib/llvm/tools/lldb/source/lldb.cpp @@ -37,6 +37,7 @@ #include "Plugins/UnwindAssembly/InstEmulation/UnwindAssemblyInstEmulation.h" #include "Plugins/DynamicLoader/POSIX-DYLD/DynamicLoaderPOSIXDYLD.h" #include "Plugins/Platform/FreeBSD/PlatformFreeBSD.h" +#include "Plugins/Platform/POSIX/PlatformPOSIX.h" #include "Plugins/LanguageRuntime/CPlusPlus/ItaniumABI/ItaniumABILanguageRuntime.h" #ifndef LLDB_DISABLE_PYTHON #include "Plugins/OperatingSystem/Python/OperatingSystemPython.h" @@ -55,7 +56,7 @@ #include "Plugins/Platform/MacOSX/PlatformiOSSimulator.h" #endif -#if defined(__linux__) or defined(__FreeBSD__) +#if defined(__linux__) || defined(__FreeBSD__) #include "Plugins/Process/elf-core/ProcessElfCore.h" #endif @@ -134,7 +135,7 @@ lldb_private::Initialize () ProcessFreeBSD::Initialize(); #endif -#if defined(__linux__) or defined(__FreeBSD__) +#if defined(__linux__) || defined(__FreeBSD__) ProcessElfCore::Initialize(); #endif //---------------------------------------------------------------------- @@ -167,7 +168,6 @@ lldb_private::Terminate () // Terminate and unload and loaded system or user LLDB plug-ins PluginManager::Terminate(); - ABISysV_x86_64::Terminate(); DisassemblerLLVMC::Terminate(); ObjectContainerBSDArchive::Terminate(); @@ -210,7 +210,7 @@ lldb_private::Terminate () ProcessFreeBSD::Terminate(); #endif -#if defined(__linux__) or defined(__FreeBSD__) +#if defined(__linux__) || defined(__FreeBSD__) ProcessElfCore::Terminate(); #endif ProcessGDBRemote::Terminate(); @@ -388,7 +388,7 @@ lldb_private::NameMatches (const char *name, llvm::StringRef match_sref(match); switch (match_type) { - case eNameMatchIgnore: + case eNameMatchIgnore: // This case cannot occur: tested before return true; case eNameMatchEquals: return name_sref == match_sref; case eNameMatchContains: return name_sref.find (match_sref) != llvm::StringRef::npos; |
