Patch to a fix dwarf relocation problem on ARM. One-line fix plus the test where it used to break.

llvm-svn: 127757

1 files changed, 5 insertions, 2 deletions

diff --git a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 15330c28d2c..cb542aef707 100644
--- a/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -3272,7 +3272,9 @@ void DwarfDebug::emitDIE(DIE *Die) {
     case dwarf::DW_AT_location: {
       if (UseDotDebugLocEntry.count(Die) != 0) {
         DIELabel *L = cast<DIELabel>(Values[i]);
-        Asm->EmitLabelDifference(L->getValue(), DwarfDebugLocSectionSym, 4);
+        // Emitting reference to label directly, so the assembler can
+        // emit the relocations and the offset automatically.
+        Asm->EmitReference(L->getValue(), dwarf::DW_EH_PE_udata4);
       } else
         Values[i]->EmitValue(Asm, Form);
       break;
@@ -3623,6 +3625,7 @@ void DwarfDebug::emitDebugLoc() {
   if (DotDebugLocEntries.empty())
     return;
 
+  // Group debug entries.
   for (SmallVector<DotDebugLocEntry, 4>::iterator
          I = DotDebugLocEntries.begin(), E = DotDebugLocEntries.end();
        I != E; ++I) {
@@ -3631,7 +3634,7 @@ void DwarfDebug::emitDebugLoc() {
       Entry.Merge(I+1);
   }
 
-  // Start the dwarf loc section.
+  // Start the dwarf location section.
   Asm->OutStreamer.SwitchSection(
     Asm->getObjFileLowering().getDwarfLocSection());
   unsigned char Size = Asm->getTargetData().getPointerSize();