> I don't see that 4.6 requires a different patch. 4.6 is missing this: 2011-04-01 Richard Henderson <rth@redhat.com> PR 48400 * dwarf2out.c (dwarf2out_source_line): Disable discriminators in strict mode before dwarf4. Re-order tests to early out before switching sections. So either *that* patch needs to be back-ported, or the tpf-specific workaround does.