Patchwork DATA_ALIGNMENT vs. DATA_ABI_ALIGNMENT (PR target/56564)

login
register
mail settings
Submitter Jakub Jelinek
Date June 11, 2013, 6:06 a.m.
Message ID <20130611060638.GW1493@tucnak.redhat.com>
Download mbox | patch
Permalink /patch/250442/
State New
Headers show

Comments

Jakub Jelinek - June 11, 2013, 6:06 a.m.
On Mon, Jun 10, 2013 at 08:44:05PM -0400, DJ Delorie wrote:
> 
> > @@ -986,12 +1053,10 @@ align_variable (tree decl, bool dont_out
> >  	  if (! DECL_THREAD_LOCAL_P (decl) || const_align <= BITS_PER_WORD)
> >  	    align = const_align;
> >  	}
> > -#endif
> >      }
> > +#endif
> 
> I think this change in get_variable_align() is wrong; it results in
> unbalanced braces inside an #ifdef, if the #ifdef body is not included
> (i.e. CONSTANT_ALIGNMENT not defined), the compile fails...

You are right, fixed thusly, committed as obvious:

2013-06-11  Jakub Jelinek  <jakub@redhat.com>

	PR target/56564
	* varasm.c (get_variable_align): Move #endif to the right place.



	Jakub
DJ Delorie - June 11, 2013, 3:20 p.m.
Thanks!

Patch

--- gcc/varasm.c	(revision 199933)
+++ gcc/varasm.c	(revision 199934)
@@ -1053,8 +1053,8 @@  get_variable_align (tree decl)
 	  if (! DECL_THREAD_LOCAL_P (decl) || const_align <= BITS_PER_WORD)
 	    align = const_align;
 	}
-    }
 #endif
+    }
 
   return align;
 }