Index: tc-m32r.c
===================================================================
RCS file: /cvs/src/src/gas/config/tc-m32r.c,v
retrieving revision 1.32
diff -c -r1.32 tc-m32r.c
*** tc-m32r.c	3 Dec 2003 17:38:45 -0000	1.32
--- tc-m32r.c	12 Dec 2003 08:58:37 -0000
***************
*** 318,339 ****
  
      case OPTION_WARN_PARALLEL:
        warn_explicit_parallel_conflicts = 1;
-       error_explicit_parallel_conflicts = 0;
        break;
  
      case OPTION_NO_WARN_PARALLEL:
        warn_explicit_parallel_conflicts = 0;
-       error_explicit_parallel_conflicts = 0;
        break;
  
      case OPTION_ERROR_PARALLEL:
-       warn_explicit_parallel_conflicts = 1;
        error_explicit_parallel_conflicts = 1;
        break;
  
      case OPTION_NO_ERROR_PARALLEL:
        error_explicit_parallel_conflicts = 0;
-       warn_explicit_parallel_conflicts = 0;
        break;
  
      case OPTION_SPECIAL:
--- 318,335 ----
***************
*** 762,767 ****
--- 758,766 ----
    if (a_operands == NULL || b_ops == NULL)
      return 0;
  
+   if ( check_outputs && !error_explicit_parallel_conflicts )
+     return 0;
+ 
    /* Scan the operand list of 'a' looking for an output operand.  */
    for (a_index = 0;
         a_operands->type != CGEN_OPINST_END;
***************
*** 1154,1170 ****
  
    if (parallel_p && warn_explicit_parallel_conflicts)
      {
-       void (* func)(const char *, ...);
- 
-       func = error_explicit_parallel_conflicts ? as_bad : as_warn;
- 
        if (first_writes_to_seconds_operands (&first, &second, FALSE))
  	/* xgettext:c-format  */
! 	func (_("%s: output of 1st instruction is the same as an input to 2nd instruction - is this intentional ?"), str2);
  
        if (first_writes_to_seconds_operands (&second, &first, FALSE))
  	/* xgettext:c-format  */
! 	func (_("%s: output of 2nd instruction is the same as an input to 1st instruction - is this intentional ?"), str2);
      }
  
    if (!parallel_p
--- 1153,1165 ----
  
    if (parallel_p && warn_explicit_parallel_conflicts)
      {
        if (first_writes_to_seconds_operands (&first, &second, FALSE))
  	/* xgettext:c-format  */
! 	as_warn (_("%s: output of 1st instruction is the same as an input to 2nd instruction - is this intentional ?"), str2);
  
        if (first_writes_to_seconds_operands (&second, &first, FALSE))
  	/* xgettext:c-format  */
! 	as_warn (_("%s: output of 2nd instruction is the same as an input to 1st instruction - is this intentional ?"), str2);
      }
  
    if (!parallel_p