combine patch problem

[Richard Henderson]

Be more careful when applying old patches.


r~

        * combine.c (combine_instructions): Add missing argument
        to try_combine.

Index: combine.c
===================================================================
RCS file: /cvs/gcc/egcs/gcc/combine.c,v
retrieving revision 1.124
diff -c -p -d -r1.124 combine.c
*** combine.c	2000/04/25 00:40:36	1.124
--- combine.c	2000/04/25 10:53:20
*************** combine_instructions (f, nregs)
*** 658,664 ****
  		   nextlinks;
  		   nextlinks = XEXP (nextlinks, 1))
  		if ((next = try_combine (insn, XEXP (links, 0),
! 					 XEXP (nextlinks, 0))) != 0)
  		  goto retry;
  	    }
  
--- 658,665 ----
  		   nextlinks;
  		   nextlinks = XEXP (nextlinks, 1))
  		if ((next = try_combine (insn, XEXP (links, 0),
! 					 XEXP (nextlinks, 0),
! 					 &new_direct_jump_p)) != 0)
  		  goto retry;
  	    }