* config/tc-mips.c (append_insn): Permit branches to be switched

	with the preceding instruction even if .set nobopt has been seen.
	.set nobopt actually controls whether to bring up an instruction
	from the branch target, which gas does not currently support.

diff --git a/gas/ChangeLog b/gas/ChangeLog
index a204c82cbc214a9df49c2cddaa9893c570b1d175..165aae1692a9c836e26eff0776f9c2f871e5a9ee 100644 (file)
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,10 @@
+Thu Apr 21 15:50:04 1994  Ian Lance Taylor  (ian@tweedledumb.cygnus.com)
+
+       * config/tc-mips.c (append_insn): Permit branches to be switched
+       with the preceding instruction even if .set nobopt has been seen.
+       .set nobopt actually controls whether to bring up an instruction
+       from the branch target, which gas does not currently support.
+
 Wed Apr 20 18:46:14 1994  Ken Raeburn  (raeburn@cujo.cygnus.com)
 
        * config/obj-coff.h, config/obj-coff.c: Deleted all code used only

diff --git a/gas/config/tc-mips.c b/gas/config/tc-mips.c
index 72b6dc18f738ba75ddb90152ef23a59dc6e78877..ed67fe87a6edb58bfef5cb9434d694c1bfcc688e 100644 (file)
--- a/gas/config/tc-mips.c
+++ b/gas/config/tc-mips.c
@@ -955,8 +955,6 @@ append_insn (place, ip, address_expr, reloc_type)
          || (pinfo & INSN_COND_BRANCH_DELAY))
        {
          if (mips_optimize < 2
-             /* If we have seen .set nobopt, don't optimize.  */
-             || mips_nobopt != 0
              /* If we have seen .set volatile or .set nomove, don't
                 optimize.  */
              || mips_nomove != 0