mep.opt (mfar): Remove -mfar as it doesn't do anything.

* config/mep/mep.opt (mfar): Remove -mfar as it doesn't do anything.

* config/mep/mep.c (mep_bundle_insns): Account for the fact that
the scheduler doesn't tag jump insns.

From-SVN: r148986

gcc/ChangeLog

+2009-06-26  DJ Delorie  <dj@redhat.com>
+
+	* config/mep/mep.opt (mfar): Remove -mfar as it doesn't do anything.
+
+	* config/mep/mep.c (mep_bundle_insns): Account for the fact that
+	the scheduler doesn't tag jump insns.
+
 2009-06-26  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* c-decl.c (merge_decls): Re-indent.

gcc/config/mep/mep.c

@@ -6925,6 +6925,8 @@ mep_bundle_insns (rtx insns)
      VOIDmode.  After this function, the first has VOIDmode and the
      rest have BImode.  */
 
+  /* Note: this doesn't appear to be true for JUMP_INSNs.  */
+
   /* First, move any NOTEs that are within a bundle, to the beginning
      of the bundle.  */
   for (insn = insns; insn ; insn = NEXT_INSN (insn))
@@ -6932,10 +6934,10 @@ mep_bundle_insns (rtx insns)
       if (NOTE_P (insn) && first)
 	/* Don't clear FIRST.  */;
 
-      else if (INSN_P (insn) && GET_MODE (insn) == TImode)
+      else if (NONJUMP_INSN_P (insn) && GET_MODE (insn) == TImode)
 	first = insn;
 
-      else if (INSN_P (insn) && GET_MODE (insn) == VOIDmode && first)
+      else if (NONJUMP_INSN_P (insn) && GET_MODE (insn) == VOIDmode && first)
 	{
 	  rtx note, prev;
 
@@ -6968,7 +6970,7 @@ mep_bundle_insns (rtx insns)
 	    }
 	}
 
-      else if (!INSN_P (insn))
+      else if (!NONJUMP_INSN_P (insn))
 	first = 0;
     }
 
@@ -6978,7 +6980,7 @@ mep_bundle_insns (rtx insns)
       if (NOTE_P (insn))
 	continue;
 
-      if (!INSN_P (insn))
+      if (!NONJUMP_INSN_P (insn))
 	{
 	  last = 0;
 	  continue;
@@ -7001,14 +7003,14 @@ mep_bundle_insns (rtx insns)
 	     The IVC2 assembler can insert whatever NOPs are needed,
 	     and allows a COP insn to be first.  */
 
-	  if (INSN_P (insn)
+	  if (NONJUMP_INSN_P (insn)
 	      && GET_CODE (PATTERN (insn)) != USE
 	      && GET_MODE (insn) == TImode)
 	    {
 	      for (last = insn;
 		   NEXT_INSN (last)
 		     && GET_MODE (NEXT_INSN (last)) == VOIDmode
-		     && INSN_P (NEXT_INSN (last));
+		     && NONJUMP_INSN_P (NEXT_INSN (last));
 		   last = NEXT_INSN (last))
 		{
 		  if (core_insn_p (last))

gcc/config/mep/mep.opt

@@ -83,10 +83,6 @@ mel
 Target Mask(LITTLE_ENDIAN) RejectNegative
 Use little-endian byte order
 
-mfar
-Target RejectNegative
-Enable -ml, -mtf, and -mc=far
-
 mio-volatile
 Target Mask(IO_VOLATILE) 
 __io vars are volatile by default