From 7d09530cef98973ed381d91d29576b3d56df21d0 Mon Sep 17 00:00:00 2001 From: Saleem Abdulrasool Date: Thu, 17 Jul 2014 16:27:44 +0000 Subject: MC: correct DWARF header for PE/COFF assembly input The header contains an offset to the DWARF abbreviations for the CU. The offset must be section relative for COFF and absolute for others. The non-assembly code path for the DWARF header generation already had the correct emission for the headers. This corrects just the assembly path. Due to the invalid relocation, processing of the debug information would halt previously on the first assembly input as the associated abbreviations would be out of range as they would have the location increased by image base and the section offset. This address PR20332. llvm-svn: 213275 --- llvm/lib/MC/MCDwarf.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'llvm/lib/MC/MCDwarf.cpp') diff --git a/llvm/lib/MC/MCDwarf.cpp b/llvm/lib/MC/MCDwarf.cpp index b14a452d85d..ae276868198 100644 --- a/llvm/lib/MC/MCDwarf.cpp +++ b/llvm/lib/MC/MCDwarf.cpp @@ -657,11 +657,12 @@ static void EmitGenDwarfInfo(MCStreamer *MCOS, // The 4 byte offset to the debug abbrevs from the start of the .debug_abbrev, // it is at the start of that section so this is zero. - if (AbbrevSectionSymbol) { - MCOS->EmitSymbolValue(AbbrevSectionSymbol, 4); - } else { + if (AbbrevSectionSymbol == nullptr) MCOS->EmitIntValue(0, 4); - } + else if (context.getAsmInfo()->needsDwarfSectionOffsetDirective()) + MCOS->EmitCOFFSecRel32(AbbrevSectionSymbol); + else + MCOS->EmitSymbolValue(AbbrevSectionSymbol, 4); const MCAsmInfo *asmInfo = context.getAsmInfo(); int AddrSize = asmInfo->getPointerSize(); -- cgit v1.2.3