Endian patch from Kirk Beitz that allows better cross platform building.

llvm-svn: 124643

3 files changed, 8 insertions, 7 deletions

diff --git a/lldb/source/Expression/ClangExpressionDeclMap.cpp b/lldb/source/Expression/ClangExpressionDeclMap.cpp
index 9484d714d57..f863969d1e4 100644
--- a/lldb/source/Expression/ClangExpressionDeclMap.cpp
+++ b/lldb/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 @@ static bool WriteAddressInto
         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/lldb/source/Expression/ClangUserExpression.cpp b/lldb/source/Expression/ClangUserExpression.cpp
index 73c7441b322..f64448a4bd2 100644
--- a/lldb/source/Expression/ClangUserExpression.cpp
+++ b/lldb/source/Expression/ClangUserExpression.cpp
@@ -275,7 +275,7 @@ ClangUserExpression::Parse (Stream &error_stream,
     //
 
     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/lldb/source/Expression/DWARFExpression.cpp b/lldb/source/Expression/DWARFExpression.cpp
index 1679c8d9df5..557095c5b1e 100644
--- a/lldb/source/Expression/DWARFExpression.cpp
+++ b/lldb/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 @@ DWARFExpression::Evaluate
                 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 @@ DWARFExpression::Evaluate
                                     }
                                     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 @@ DWARFExpression::Evaluate
                                 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");