[patch] Do not generate discriminator directive in strict mode

[Eric Botcazou]

> 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?  
This directive apparently confuses (some versions of) the Wind River debugger.

-- 
Eric Botcazou