diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2016-01-04 01:16:32 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2016-01-04 01:16:32 +0000 |
| commit | 9f2f44ceeb195c67fbbf0953f03c530f6f1e59d4 (patch) | |
| tree | 1a3cc0a2c3d432ddf9ffc14f06bd43e8097fc93c /contrib/llvm/tools/lldb/source/Core/Logging.cpp | |
| parent | 0a97e59728ecf251d065745cb716ffe32b24aa28 (diff) | |
| parent | 3bd2e91faeb9eeec1aae82c64a3253afff551cfd (diff) | |
| download | src-9f2f44ceeb195c67fbbf0953f03c530f6f1e59d4.tar.gz src-9f2f44ceeb195c67fbbf0953f03c530f6f1e59d4.zip | |
Merge LLDB 3.8
As with previous imports a number of plugins not immediately relevant
to FreeBSD have been excluded:
ABIMacOSX_i386
ABIMacOSX_arm
ABIMacOSX_arm64
ABISysV_hexagon
AppleObjCRuntimeV2
AppleObjCRuntimeV1
SystemRuntimeMacOSX
RenderScriptRuntime
GoLanguageRuntime
GoLanguage
ObjCLanguage
ObjCPlusPlusLanguage
ObjectFilePECOFF
DynamicLoaderWindowsDYLD
platform_linux
platform_netbsd
PlatformWindows
PlatformKalimba
platform_android
DynamicLoaderMacOSXDYLD
ObjectContainerUniversalMachO
PlatformRemoteiOS
PlatformMacOSX
OperatingSystemGo
Notes
Notes:
svn path=/projects/clang380-import/; revision=293127
Diffstat (limited to 'contrib/llvm/tools/lldb/source/Core/Logging.cpp')
| -rw-r--r-- | contrib/llvm/tools/lldb/source/Core/Logging.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/contrib/llvm/tools/lldb/source/Core/Logging.cpp b/contrib/llvm/tools/lldb/source/Core/Logging.cpp index 412536adbb34..d08d833ee469 100644 --- a/contrib/llvm/tools/lldb/source/Core/Logging.cpp +++ b/contrib/llvm/tools/lldb/source/Core/Logging.cpp @@ -148,6 +148,7 @@ lldb_private::DisableLog (const char **categories, Stream *feedback_strm) else if (0 == ::strcasecmp(arg, "os")) flag_bits &= ~LIBLLDB_LOG_OS; else if (0 == ::strcasecmp(arg, "jit")) flag_bits &= ~LIBLLDB_LOG_JIT_LOADER; else if (0 == ::strcasecmp(arg, "language")) flag_bits &= ~LIBLLDB_LOG_LANGUAGE; + else if (0 == ::strncasecmp(arg, "formatters", 10)) flag_bits &= ~LIBLLDB_LOG_DATAFORMATTERS; else { feedback_strm->Printf ("error: unrecognized log category '%s'\n", arg); @@ -224,6 +225,7 @@ lldb_private::EnableLog (StreamSP &log_stream_sp, uint32_t log_options, const ch else if (0 == ::strncasecmp(arg, "watch", 5)) flag_bits |= LIBLLDB_LOG_WATCHPOINTS; else if (0 == ::strcasecmp(arg, "jit")) flag_bits |= LIBLLDB_LOG_JIT_LOADER; else if (0 == ::strcasecmp(arg, "language")) flag_bits |= LIBLLDB_LOG_LANGUAGE; + else if (0 == ::strncasecmp(arg, "formatters", 10)) flag_bits |= LIBLLDB_LOG_DATAFORMATTERS; else { feedback_strm->Printf("error: unrecognized log category '%s'\n", arg); @@ -254,6 +256,7 @@ lldb_private::ListLogCategories (Stream *strm) " dyld - log shared library related activities\n" " events - log broadcaster, listener and event queue activities\n" " expr - log expressions\n" + " formatters - log data formatters related activities\n" " host - log host activities\n" " jit - log JIT events in the target\n" " language - log language runtime events\n" |