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

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

[Kaveh R. Ghazi]

	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;

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

[Jim Wilson]

This is OK to install.

Jim

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

[Kaveh R. Ghazi]

 > From: Jim Wilson <wilson@cygnus.com>
 > Subject: Re: egcs-980315, WARNING fixes part 2 (minor addition) 
 > 
 > This is OK to install.
 > Jim

	Done, (slightly modified to follow Robert's suggestion below,
hope that's ok.) 

		--Kaveh


 > From: Robert Lipe <robertl@dgii.com>
 > To: "Kaveh R. Ghazi" <ghazi@caip.rutgers.edu>
 > Subject: Re: egcs-980315, WARNING fixes part 2 (minor addition)
 > References: < 199803171537.KAA10985@caip.rutgers.edu >
 > Mime-Version: 1.0
 > Content-Type: text/plain; charset=us-ascii
 > X-Mailer: Mutt 0.89
 > In-Reply-To: < 199803171537.KAA10985@caip.rutgers.edu >; from Kaveh R. Ghazi on Tue, Mar 17, 1998 at 10:37:06AM -0500
 > Status: RO
 >  
 > > 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;
 >  
 > Can these just be smooshed together rather than having two consecutive
 > identical #ifdefs?
 >  
 > No justification necessary regardless of what you decide...
 > RJL
--
Kaveh R. Ghazi			Project Manager / Custom Development
ghazi@caip.rutgers.edu		Icon CMT Corp.

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

[Jim Wilson]

	Done, (slightly modified to follow Robert's suggestion below,
	hope that's ok.) 

yeah, no problem.  It is OK to fix something I missed like this.

Jim