(i386-linux x sh-elf) build failure

[Clinton Popetz]

On Mon, May 22, 2000 at 03:17:07PM -0700, Toshiyasu Morita wrote:
 
> Looks like someone modified invert_jump parameters?

> Here is a long of the build failure:
> ./../egcs/gcc/config/sh/sh.c: In function `gen_far_branch':
> ./../egcs/gcc/config/sh/sh.c:2657: too few arguments to function 
> `invert_jump'
> ./../egcs/gcc/config/sh/sh.c: In function `split_branches':
> ./../egcs/gcc/config/sh/sh.c:3390: too few arguments to function 
> `redirect_jump'
> ./../egcs/gcc/config/sh/sh.c:3453: too few arguments to function 
> `redirect_jump'

Yea, I saw that this morning.  Here's what I have locally.  Some of the NUSES
futzing in sh.c can now be eliminated, but until then this patch restores the
previous behavior (and fixes the const warnings since I was there.)


Mon May 22 17:23:38 2000  Clinton Popetz  <cpopetz@cygnus.com>

	* config/sh/sh.c (gen_far_branch, split_branches): Update
	to reflect new prototypes for redirect_jump and invert_jump.
	(sh_insn_length_adjustment): Get rid of const warnings.
		
	
Index: config/sh/sh.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/config/sh/sh.c,v
retrieving revision 1.52
diff -c -2 -p -r1.52 sh.c
*** sh.c	2000/04/05 23:12:52	1.52
--- sh.c	2000/05/22 22:19:57
*************** gen_far_branch (bp)
*** 2655,2659 ****
    emit_label_after (bp->near_label, insn);
    JUMP_LABEL (jump) = bp->far_label;
!   if (! invert_jump (insn, label))
      abort ();
    /* Prevent reorg from undoing our splits.  */
--- 2655,2659 ----
    emit_label_after (bp->near_label, insn);
    JUMP_LABEL (jump) = bp->far_label;
!   if (! invert_jump (insn, label, 1))
      abort ();
    /* Prevent reorg from undoing our splits.  */
*************** split_branches (first)
*** 3388,3392 ****
  		    bp->address = addr;
  		  }
! 		if (! redirect_jump (insn, label))
  		  abort ();
  	      }
--- 3388,3392 ----
  		    bp->address = addr;
  		  }
! 		if (! redirect_jump (insn, label, 1))
  		  abort ();
  	      }
*************** split_branches (first)
*** 3451,3455 ****
  			LABEL_NUSES (far_label)++;
  		      }
! 		    redirect_jump (insn, NULL_RTX);
  		    far_label = 0;
  		  }
--- 3451,3455 ----
  			LABEL_NUSES (far_label)++;
  		      }
! 		    redirect_jump (insn, NULL_RTX, 1);
  		    far_label = 0;
  		  }
*************** sh_insn_length_adjustment (insn)
*** 5157,5161 ****
        int sum = 0;
        rtx body = PATTERN (insn);
!       char *template, c;
        int maybe_label = 1;
  
--- 5157,5162 ----
        int sum = 0;
        rtx body = PATTERN (insn);
!       const char *template;
!       char c;
        int maybe_label = 1;