On 04/20/2011 12:09 PM, Eric Botcazou wrote: >> How is this not redundant with the existing >> >> /* The discriminator column was added in dwarf4. Simplify the below >> by simply removing it if we're not supposed to output it. */ >> if (dwarf_version < 4 && dwarf_strict) >> discriminator = 0; >> >> check near the top of the function? > > Obviously I missed this recent change, sorry. So the question is: would the > change be appropriate for the release branches, where we emit the directive > unconditionally, i.e 4.5 and 4.6 branches, or would mine be safer for them?
Let's try to keep the branches more similar than not. It's just as safe, since prior to mainline we ignore the discriminator when not emitting via gas directive. r~
