Define LIBXML2_DEFINED in the Xcode project for Xcode builds so Darwin builds can take advantage of the new GDB register info from the target XML.
Also add "#if defined( LIBXML2_DEFINED )" around code that already used libxml2 in SymbolVendorMacOSX.cpp.
Cleaned up some warnings in ProcessGDBRemote.cpp.
llvm-svn: 235144
diff --git a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
index 6f36310..dc61ec8 100644
--- a/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
+++ b/lldb/source/Plugins/Process/gdb-remote/ProcessGDBRemote.cpp
@@ -3491,7 +3491,7 @@
{ "data_ptr", GdbServerRegisterInfo::eDataPtr },
{ "code_ptr", GdbServerRegisterInfo::eCodePtr },
{ "i387_ext", GdbServerRegisterInfo::eI387Ext }, // 80bit fpu
- { nullptr } // sentinel
+ { nullptr , GdbServerRegisterInfo::eUnknown } // sentinel
};
// find the first sibling with a matching name
diff --git a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
index 2fead72..1e99dcf 100644
--- a/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
+++ b/lldb/source/Plugins/SymbolVendor/MacOSX/SymbolVendorMacOSX.cpp
@@ -9,8 +9,11 @@
#include "SymbolVendorMacOSX.h"
+#if defined( LIBXML2_DEFINED )
#include <libxml/parser.h>
#include <libxml/tree.h>
+#endif // #if defined( LIBXML2_DEFINED )
+
#include <string.h>
#include "lldb/Core/Module.h"
@@ -174,6 +177,7 @@
dsym_objfile_sp = ObjectFile::FindPlugin(module_sp, &dsym_fspec, 0, dsym_fspec.GetByteSize(), dsym_file_data_sp, dsym_file_data_offset);
if (UUIDsMatch(module_sp.get(), dsym_objfile_sp.get(), feedback_strm))
{
+#if defined( LIBXML2_DEFINED )
char dsym_path[PATH_MAX];
if (module_sp->GetSourceMappingList().IsEmpty() && dsym_fspec.GetPath(dsym_path, sizeof(dsym_path)))
{
@@ -277,6 +281,7 @@
}
}
}
+#endif // #if defined( LIBXML2_DEFINED )
symbol_vendor->AddSymbolFileRepresentation(dsym_objfile_sp);
return symbol_vendor;