Ah, ok.
> I don't see that 4.6 requires a different patch.
4.6 is missing this:
2011-04-01 Richard Henderson
PR 48400
* dwarf2out.c (dwarf2out_source_line): Disable discriminators
in strict mode before dwarf4. Re-order tests to early out
before switching sections.
S
On 2012-07-31 15:51, DJ Delorie wrote:
>> I don't see that 4.6 requires a different patch.
>
> 4.6 is missing this:
>
> 2011-04-01 Richard Henderson
>
> PR 48400
> * dwarf2out.c (dwarf2out_source_line): Disable discriminators
> in strict mode before dwarf4. Re-order tests t
On 2012-07-31 15:21, DJ Delorie wrote:
> What about older branches? 4.7 needs this patch, 4.6 needs my
> original patch.
I don't see that 4.6 requires a different patch.
Otherwise ok to backport.
r~
> TARGET_TPF is always defined. Just use a C if.
> Otherwise ok.
Thanks, checked in as attached.
What about older branches? 4.7 needs this patch, 4.6 needs my
original patch.
2012-07-31 DJ Delorie
* config/s390/s390.c (s390_option_override): Disable DWARF 3/4
extensions fo
On 2012-07-31 14:09, DJ Delorie wrote:
> +#ifdef TARGET_TPF
> + /* Don't emit DWARF3/4 unless specifically selected. The TPF
> + debuggers do not yet support DWARF 3/4. */
> + if (!global_options_set.x_dwarf_strict)
> +dwarf_strict = 1;
> + if (!global_options_set.x_dwarf_version)
> +
Ah, the original complaint was for a gcc branch which doesn't have
your strict-dwarf/discriminator patch.
How's this?
Index: gcc/config/s390/s390.c
===
--- gcc/config/s390/s390.c (revision 190017)
+++ gcc/config/s390/s390.c
On 2012-07-30 21:07, DJ Delorie wrote:
> +
> +/* GAS supports it, but the debuggers don't, so avoid it. */
> +#define SUPPORTS_DISCRIMINATOR 0
Then you shouldn't be fiddling this, but rather dwarf_strict.
See e.g. darwin and vxworks ports.
r~
The TPF assembler supports dwarf4 discriminators, but the TPF
debuggers do not. Ok to apply?
* config/s390/tpf.h (SUPPORTS_DISCRIMINATOR): Define to 0 for TPF.
Index: gcc/config/s390/tpf.h
===
--- gcc/config/s390/tpf.h
