2008-02-11 Julian Brown <julian@codesourcery.com> Merge from MIPS: 2005-03-21 Maciej W. Rozycki <macro@mips.com> * gas/config/tc-mips.c (append_insn): Disable swapping of MIPS16 branches as it breaks DWARF-2 line information. diff -p -up binutils-2.19.51.0.2/gas/config/tc-mips.c.mips_gas~ binutils-2.19.51.0.2/gas/config/tc-mips.c --- binutils-2.19.51.0.2/gas/config/tc-mips.c.mips_gas~ 2009-02-09 21:45:46.489272291 -0500 +++ binutils-2.19.51.0.2/gas/config/tc-mips.c 2009-02-11 02:57:11.418527388 -0500 @@ -3238,7 +3238,11 @@ append_insn (struct mips_cl_insn *ip, ex || (mips_opts.mips16 && history[0].fixp[0]) /* If the previous instruction is a sync, sync.l, or sync.p, we can not swap. */ - || (prev_pinfo & INSN_SYNC)) + || (prev_pinfo & INSN_SYNC) + /* FIXME: Disable MIPS16 branch swapping for now as it + breaks DWARF-2 line information irrecoverably. + --macro */ + || mips_opts.mips16) { if (mips_opts.mips16 && (pinfo & INSN_UNCOND_BRANCH_DELAY)