Endian patch from Kirk Beitz that allows better cross platform building.
git-svn-id: https://llvm.org/svn/llvm-project/llvdb/trunk@124643 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/source/Expression/ClangExpressionDeclMap.cpp b/source/Expression/ClangExpressionDeclMap.cpp
index 9484d71..f863969 100644
--- a/source/Expression/ClangExpressionDeclMap.cpp
+++ b/source/Expression/ClangExpressionDeclMap.cpp
@@ -23,6 +23,7 @@
#include "lldb/Core/ValueObjectConstResult.h"
#include "lldb/Expression/ClangASTSource.h"
#include "lldb/Expression/ClangPersistentVariables.h"
+#include "lldb/Host/Endian.h"
#include "lldb/Symbol/ClangASTContext.h"
#include "lldb/Symbol/ClangNamespaceDecl.h"
#include "lldb/Symbol/CompileUnit.h"
@@ -861,13 +862,13 @@
case 4:
{
uint32_t address32 = address & 0xffffffffll;
- str.PutRawBytes(&address32, sizeof(address32), eByteOrderHost, eByteOrderInvalid);
+ str.PutRawBytes(&address32, sizeof(address32), endian::InlHostByteOrder(), eByteOrderInvalid);
}
break;
case 8:
{
uint64_t address64 = address;
- str.PutRawBytes(&address64, sizeof(address64), eByteOrderHost, eByteOrderInvalid);
+ str.PutRawBytes(&address64, sizeof(address64), endian::InlHostByteOrder(), eByteOrderInvalid);
}
break;
}
diff --git a/source/Expression/ClangUserExpression.cpp b/source/Expression/ClangUserExpression.cpp
index 73c7441..f64448a 100644
--- a/source/Expression/ClangUserExpression.cpp
+++ b/source/Expression/ClangUserExpression.cpp
@@ -275,7 +275,7 @@
//
m_dwarf_opcodes.reset(new StreamString);
- m_dwarf_opcodes->SetByteOrder (lldb::eByteOrderHost);
+ m_dwarf_opcodes->SetByteOrder (lldb::endian::InlHostByteOrder());
m_dwarf_opcodes->GetFlags ().Set (Stream::eBinary);
m_local_variables.reset(new ClangExpressionVariableList());
diff --git a/source/Expression/DWARFExpression.cpp b/source/Expression/DWARFExpression.cpp
index 1679c8d..557095c 100644
--- a/source/Expression/DWARFExpression.cpp
+++ b/source/Expression/DWARFExpression.cpp
@@ -21,7 +21,7 @@
#include "lldb/Expression/ClangExpressionDeclMap.h"
#include "lldb/Expression/ClangExpressionVariable.h"
-#include "lldb/Host/Host.h"
+#include "lldb/Host/Endian.h"
#include "lldb/lldb-private-log.h"
@@ -2272,7 +2272,7 @@
tmp = stack.back();
stack.pop_back();
Value::ContextType context_type = stack.back().GetContextType();
- StreamString new_value(Stream::eBinary, 4, eByteOrderHost);
+ StreamString new_value(Stream::eBinary, 4, lldb::endian::InlHostByteOrder());
switch (context_type)
{
case Value::eContextTypeClangType:
@@ -2316,7 +2316,7 @@
}
break;
case Value::eValueTypeHostAddress:
- if (exe_ctx->process->GetByteOrder() != Host::GetByteOrder())
+ if (exe_ctx->process->GetByteOrder() != lldb::endian::InlHostByteOrder())
{
if (error_ptr)
error_ptr->SetErrorStringWithFormat ("Copy of composite types between incompatible byte orders is unimplemented");
@@ -2341,7 +2341,7 @@
switch (target_value_type)
{
case Value::eValueTypeLoadAddress:
- if (exe_ctx->process->GetByteOrder() != Host::GetByteOrder())
+ if (exe_ctx->process->GetByteOrder() != lldb::endian::InlHostByteOrder())
{
if (error_ptr)
error_ptr->SetErrorStringWithFormat ("Copy of composite types between incompatible byte orders is unimplemented");