* 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 a204c82..165aae1 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 72b6dc1..ed67fe8 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