egcs-980315, WARNING fixes part 2 (minor addition)

["Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>]

	Here is another small warning fix.  It is okay to install?

		--Kaveh



Mon Mar 16 22:32:01 1998  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>

	* final.c (shorten_branches): Add parentheses around +/- in
	operand of &.

	* flow.c (life_analysis): Wrap variable `i' in macro ELIMINABLE_REGS.


diff -rup orig/egcs-980315/gcc/final.c egcs-980315/gcc/final.c
--- orig/egcs-980315/gcc/final.c	Mon Mar 16 22:21:15 1998
+++ egcs-980315/gcc/final.c	Mon Mar 16 22:11:56 1998
@@ -1165,7 +1165,7 @@ shorten_branches (first)
 	  if (log)
 	    {
 	      int align = 1 << log;
-	      int new_address = insn_current_address + align - 1 & -align;
+	      int new_address = (insn_current_address + align - 1) & -align;
 	      insn_lengths[uid] = new_address - insn_current_address;
 	      insn_current_address = new_address;
 	    }
@@ -1268,7 +1268,7 @@ shorten_branches (first)
 	      if (log > insn_current_align)
 		{
 		  int align = 1 << log;
-		  int new_address= insn_current_address + align - 1 & -align;
+		  int new_address= (insn_current_address + align - 1) & -align;
 		  insn_lengths[uid] = new_address - insn_current_address;
 		  insn_current_align = log;
 		  insn_current_address = new_address;
diff -rup orig/egcs-980315/gcc/flow.c egcs-980315/gcc/flow.c
--- orig/egcs-980315/gcc/flow.c	Mon Mar 16 22:21:59 1998
+++ egcs-980315/gcc/flow.c	Mon Mar 16 22:13:53 1998
@@ -961,7 +961,9 @@ life_analysis (f, nregs, file)
      int nregs;
      FILE *file;
 {
+#ifdef ELIMINABLE_REGS
   register size_t i;
+#endif
 
 #ifdef ELIMINABLE_REGS
   static struct {int from, to; } eliminables[] = ELIMINABLE_REGS;