From: Richard Sandiford Date: Wed, 9 Mar 2005 09:50:16 +0000 (+0000) Subject: * config/tc-mips.c (append_insn): Remove cop_interlocks test from X-Git-Tag: binutils-csl-arm-2005q1-branchpoint~45 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e37da8468078fb96b984639e8074a4930537a7c4;p=thirdparty%2Fbinutils-gdb.git * config/tc-mips.c (append_insn): Remove cop_interlocks test from branch delay code. --- diff --git a/gas/ChangeLog b/gas/ChangeLog index 160fb722b29..d020a8f551c 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,8 @@ +2005-03-09 Richard Sandiford + + * config/tc-mips.c (append_insn): Remove cop_interlocks test from + branch delay code. + 2005-03-09 Richard Sandiford * config/tc-mips.h (mips_flush_pending_output): Delete. diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c index 8e464f631de..021dd4030b3 100644 --- a/gas/config/tc-mips.c +++ b/gas/config/tc-mips.c @@ -2513,17 +2513,6 @@ append_insn (struct mips_cl_insn *ip, expressionS *address_expr, frags for different purposes. */ || (! mips_opts.mips16 && prev_insn_frag_type == rs_machine_dependent) - /* If the branch reads the condition codes, we don't - even try to swap, because in the sequence - ctc1 $X,$31 - INSN - INSN - bc1t LABEL - we can not swap, and I don't feel like handling that - case. */ - || (! mips_opts.mips16 - && (pinfo & INSN_READ_COND_CODE) - && ! cop_interlocks) /* Check for conflicts between the branch and the instructions before the candidate delay slot. */ || nops_for_insn (history + 1, ip) > 0 diff --git a/gas/testsuite/ChangeLog b/gas/testsuite/ChangeLog index 6ce90b0a435..793640dcf39 100644 --- a/gas/testsuite/ChangeLog +++ b/gas/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2005-03-09 Richard Sandiford + + * gas/mips/relax-swap1-mips[12].d: Expect the delay slots of + bc1f and bc1t to be filled. + * gas/mips/branch-misc-3.[sd]: New test. + * gas/mips/mips.exp: Run it. + 2005-03-08 Jan Beulich * gas/ia64/no-fit.[ls]: New.