Make helpers static. Add missing include so LLVMInitializeObjCARCOpts gets C linkage.

[oota-llvm.git] / lib / DebugInfo / DWARFDebugFrame.cpp

diff --git a/lib/DebugInfo/DWARFDebugFrame.cpp b/lib/DebugInfo/DWARFDebugFrame.cpp
index 62e485625126f1b10618d9087a388118943c341c..69e3a3a62fcb8e55405621c9bf2961197c30e5bc 100644 (file)
--- a/lib/DebugInfo/DWARFDebugFrame.cpp
+++ b/lib/DebugInfo/DWARFDebugFrame.cpp
@@ -46,7 +46,7 @@ protected:
   uint64_t Length;
 };
 
-
+namespace {
 /// \brief DWARF Common Information Entry (CIE)
 class CIE : public FrameEntry {
 public:
@@ -64,12 +64,14 @@ public:
   }
 
   void dumpHeader(raw_ostream &OS) const {
-    OS << format("%08x %08x %08x CIE", Offset, Length, DW_CIE_ID) << "\n";
+    OS << format("%08x %08x %08x CIE",
+                 (uint32_t)Offset, (uint32_t)Length, DW_CIE_ID)
+       << "\n";
     OS << format("  Version:               %d\n", Version);
     OS << "  Augmentation:          \"" << Augmentation << "\"\n";
-    OS << format("  Code alignment factor: %u\n", CodeAlignmentFactor);
-    OS << format("  Data alignment factor: %d\n", DataAlignmentFactor);
-    OS << format("  Return address column: %d\n", ReturnAddressRegister);
+    OS << format("  Code alignment factor: %u\n", (uint32_t)CodeAlignmentFactor);
+    OS << format("  Data alignment factor: %d\n", (int32_t)DataAlignmentFactor);
+    OS << format("  Return address column: %d\n", (int32_t)ReturnAddressRegister);
     OS << "\n";
   }
 
@@ -103,10 +105,12 @@ public:
   }
 
   void dumpHeader(raw_ostream &OS) const {
-    OS << format("%08x %08x %08x FDE ", Offset, Length, LinkedCIEOffset);
+    OS << format("%08x %08x %08x FDE ",
+                 (uint32_t)Offset, (uint32_t)Length, (int32_t)LinkedCIEOffset);
     OS << format("cie=%08x pc=%08x...%08x\n",
-                 LinkedCIEOffset, InitialLocation,
-                 InitialLocation + AddressRange);
+                 (int32_t)LinkedCIEOffset,
+                 (uint32_t)InitialLocation,
+                 (uint32_t)InitialLocation + (uint32_t)AddressRange);
     OS << "\n";
     if (LinkedCIE) {
       OS << format("%p\n", LinkedCIE);
@@ -124,6 +128,7 @@ private:
   uint64_t AddressRange;
   CIE *LinkedCIE;
 };
+} // end anonymous namespace
 
 
 DWARFDebugFrame::DWARFDebugFrame() {