<div dir="ltr">Sorry about that, will remember next time!<div><br></div><div>Committed in r188869.</div></div><div class="gmail_extra"><br><br><div class="gmail_quote">On Tue, Aug 20, 2013 at 10:56 PM, Eric Christopher <span dir="ltr"><<a href="mailto:echristo@gmail.com" target="_blank">echristo@gmail.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">FWIW llvm-commits for the back end patches next time :)<br>
<span class="HOEnZb"><font color="#888888"><br>
-eric<br>
</font></span><div class="HOEnZb"><div class="h5"><br>
On Tue, Aug 20, 2013 at 10:27 PM, David Majnemer<br>
<<a href="mailto:david.majnemer@gmail.com">david.majnemer@gmail.com</a>> wrote:<br>
> Hi echristo, dblaikie,<br>
><br>
> LLVM would generate DWARF with version 3 in the .debug_pubname and<br>
> .debug_pubtypes version fields.  This would lead SGI dwarfdump to fail<br>
> parsing the DWARF with (in the instance of .debug_pubnames) would exit<br>
> with:<br>
> dwarfdump ERROR:  dwarf_get_globals: DW_DLE_PUBNAMES_VERSION_ERROR (123)<br>
><br>
> This fixes PR16950.<br>
><br>
> <a href="http://llvm-reviews.chandlerc.com/D1454" target="_blank">http://llvm-reviews.chandlerc.com/D1454</a><br>
><br>
> Files:<br>
>   include/llvm/Support/Dwarf.h<br>
>   lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>
>   test/DebugInfo/dwarf-public-names.ll<br>
><br>
> Index: include/llvm/Support/Dwarf.h<br>
> ===================================================================<br>
> --- include/llvm/Support/Dwarf.h<br>
> +++ include/llvm/Support/Dwarf.h<br>
> @@ -56,7 +56,9 @@<br>
><br>
>    DW_TAG_user_base = 0x1000,            // Recommended base for user tags.<br>
><br>
> -  DW_CIE_VERSION = 1                    // Common frame information version.<br>
> +  DW_CIE_VERSION = 1,                   // Common frame information version.<br>
> +  DW_PUBTYPES_VERSION = 2,              // Section version number for .debug_pubtypes.<br>
> +  DW_PUBNAMES_VERSION = 2               // Section version number for .debug_pubnames.<br>
>  };<br>
><br>
><br>
> Index: lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>
> ===================================================================<br>
> --- lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>
> +++ lib/CodeGen/AsmPrinter/DwarfDebug.cpp<br>
> @@ -35,6 +35,7 @@<br>
>  #include "llvm/MC/MCSymbol.h"<br>
>  #include "llvm/Support/CommandLine.h"<br>
>  #include "llvm/Support/Debug.h"<br>
> +#include "llvm/Support/Dwarf.h"<br>
>  #include "llvm/Support/ErrorHandling.h"<br>
>  #include "llvm/Support/FormattedStream.h"<br>
>  #include "llvm/Support/MD5.h"<br>
> @@ -2321,7 +2322,7 @@<br>
>      Asm->OutStreamer.EmitLabel(Asm->GetTempSymbol("pubnames_begin", ID));<br>
><br>
>      Asm->OutStreamer.AddComment("DWARF Version");<br>
> -    Asm->EmitInt16(DwarfVersion);<br>
> +    Asm->EmitInt16(dwarf::DW_PUBNAMES_VERSION);<br>
><br>
>      Asm->OutStreamer.AddComment("Offset of Compilation Unit Info");<br>
>      Asm->EmitSectionOffset(Asm->GetTempSymbol(ISec->getLabelBeginName(), ID),<br>
> @@ -2368,7 +2369,7 @@<br>
>                                                    TheCU->getUniqueID()));<br>
><br>
>      if (Asm->isVerbose()) Asm->OutStreamer.AddComment("DWARF Version");<br>
> -    Asm->EmitInt16(DwarfVersion);<br>
> +    Asm->EmitInt16(dwarf::DW_PUBTYPES_VERSION);<br>
><br>
>      Asm->OutStreamer.AddComment("Offset of Compilation Unit Info");<br>
>      const MCSection *ISec = Asm->getObjFileLowering().getDwarfInfoSection();<br>
> Index: test/DebugInfo/dwarf-public-names.ll<br>
> ===================================================================<br>
> --- test/DebugInfo/dwarf-public-names.ll<br>
> +++ test/DebugInfo/dwarf-public-names.ll<br>
> @@ -37,6 +37,7 @@<br>
><br>
>  ; Skip the output to the header of the pubnames section.<br>
>  ; CHECK: debug_pubnames<br>
> +; CHECK: Version:               2<br>
><br>
>  ; Check for each name in the output.<br>
>  ; CHECK: global_namespace_variable<br>
</div></div></blockquote></div><br></div>