25c7f1
2013-06-19  Igor Zamyatin  <igor.zamyatin@intel.com>
25c7f1
25c7f1
	* gcc.dg/tree-ssa/loop-19.c: Add -fno-common.
25c7f1
25c7f1
2013-06-12  Jakub Jelinek  <jakub@redhat.com>
25c7f1
25c7f1
	PR target/56564
25c7f1
	* varasm.c (decl_binds_to_current_def_p): Call binds_local_p
25c7f1
	target hook even for !TREE_PUBLIC decls.  If no resolution info
25c7f1
	is available, return false for common and external decls.
25c7f1
25c7f1
	* gcc.target/i386/pr56564-1.c: Skip on darwin, mingw and cygwin.
25c7f1
	* gcc.target/i386/pr56564-3.c: Likewise.
25c7f1
25c7f1
2013-06-11  Jakub Jelinek  <jakub@redhat.com>
25c7f1
25c7f1
	PR target/56564
25c7f1
	* varasm.c (get_variable_align): Move #endif to the right place.
25c7f1
25c7f1
2013-06-10  Jakub Jelinek  <jakub@redhat.com>
25c7f1
25c7f1
	PR target/56564
25c7f1
	* varasm.c (align_variable): Don't use DATA_ALIGNMENT or
25c7f1
	CONSTANT_ALIGNMENT if !decl_binds_to_current_def_p (decl).
25c7f1
	Use DATA_ABI_ALIGNMENT for that case instead if defined.
25c7f1
	(get_variable_align): New function.
25c7f1
	(get_variable_section, emit_bss, emit_common,
25c7f1
	assemble_variable_contents, place_block_symbol): Use
25c7f1
	get_variable_align instead of DECL_ALIGN.
25c7f1
	(assemble_noswitch_variable): Add align argument, use it
25c7f1
	instead of DECL_ALIGN.
25c7f1
	(assemble_variable): Adjust caller.  Use get_variable_align
25c7f1
	instead of DECL_ALIGN.
25c7f1
	* config/i386/i386.h (DATA_ALIGNMENT): Adjust x86_data_alignment
25c7f1
	caller.
25c7f1
	(DATA_ABI_ALIGNMENT): Define.
25c7f1
	* config/i386/i386-protos.h (x86_data_alignment): Adjust prototype.
25c7f1
	* config/i386/i386.c (x86_data_alignment): Add opt argument.  If
25c7f1
	opt is false, only return the psABI mandated alignment increase.
25c7f1
	* config/c6x/c6x.h (DATA_ALIGNMENT): Renamed to...
25c7f1
	(DATA_ABI_ALIGNMENT): ... this.
25c7f1
	* config/mmix/mmix.h (DATA_ALIGNMENT): Renamed to...
25c7f1
	(DATA_ABI_ALIGNMENT): ... this.
25c7f1
	* config/mmix/mmix.c (mmix_data_alignment): Adjust function comment.
25c7f1
	* config/s390/s390.h (DATA_ALIGNMENT): Renamed to...
25c7f1
	(DATA_ABI_ALIGNMENT): ... this.
25c7f1
	* doc/tm.texi.in (DATA_ABI_ALIGNMENT): Document.
25c7f1
	* doc/tm.texi: Regenerated.
25c7f1
25c7f1
	* gcc.target/i386/pr56564-1.c: New test.
25c7f1
	* gcc.target/i386/pr56564-2.c: New test.
25c7f1
	* gcc.target/i386/pr56564-3.c: New test.
25c7f1
	* gcc.target/i386/pr56564-4.c: New test.
25c7f1
	* gcc.target/i386/avx256-unaligned-load-4.c: Add -fno-common.
25c7f1
	* gcc.target/i386/avx256-unaligned-store-1.c: Likewise.
25c7f1
	* gcc.target/i386/avx256-unaligned-store-3.c: Likewise.
25c7f1
	* gcc.target/i386/avx256-unaligned-store-4.c: Likewise.
25c7f1
	* gcc.target/i386/vect-sizes-1.c: Likewise.
25c7f1
	* gcc.target/i386/memcpy-1.c: Likewise.
25c7f1
	* gcc.dg/vect/costmodel/i386/costmodel-vect-31.c (tmp): Initialize.
25c7f1
	* gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c (tmp): Likewise.
25c7f1
25c7f1
--- gcc/doc/tm.texi.in	(revision 199897)
25c7f1
+++ gcc/doc/tm.texi.in	(revision 199898)
25c7f1
@@ -1062,6 +1062,15 @@ arrays to be word-aligned so that @code{
25c7f1
 constants to character arrays can be done inline.
25c7f1
 @end defmac
25c7f1
 
25c7f1
+@defmac DATA_ABI_ALIGNMENT (@var{type}, @var{basic-align})
25c7f1
+Similar to @code{DATA_ALIGNMENT}, but for the cases where the ABI mandates
25c7f1
+some alignment increase, instead of optimization only purposes.  E.g.@
25c7f1
+AMD x86-64 psABI says that variables with array type larger than 15 bytes
25c7f1
+must be aligned to 16 byte boundaries.
25c7f1
+
25c7f1
+If this macro is not defined, then @var{basic-align} is used.
25c7f1
+@end defmac
25c7f1
+
25c7f1
 @defmac CONSTANT_ALIGNMENT (@var{constant}, @var{basic-align})
25c7f1
 If defined, a C expression to compute the alignment given to a constant
25c7f1
 that is being placed in memory.  @var{constant} is the constant and
25c7f1
--- gcc/doc/tm.texi	(revision 199897)
25c7f1
+++ gcc/doc/tm.texi	(revision 199898)
25c7f1
@@ -1078,6 +1078,15 @@ arrays to be word-aligned so that @code{
25c7f1
 constants to character arrays can be done inline.
25c7f1
 @end defmac
25c7f1
 
25c7f1
+@defmac DATA_ABI_ALIGNMENT (@var{type}, @var{basic-align})
25c7f1
+Similar to @code{DATA_ALIGNMENT}, but for the cases where the ABI mandates
25c7f1
+some alignment increase, instead of optimization only purposes.  E.g.@
25c7f1
+AMD x86-64 psABI says that variables with array type larger than 15 bytes
25c7f1
+must be aligned to 16 byte boundaries.
25c7f1
+
25c7f1
+If this macro is not defined, then @var{basic-align} is used.
25c7f1
+@end defmac
25c7f1
+
25c7f1
 @defmac CONSTANT_ALIGNMENT (@var{constant}, @var{basic-align})
25c7f1
 If defined, a C expression to compute the alignment given to a constant
25c7f1
 that is being placed in memory.  @var{constant} is the constant and
25c7f1
--- gcc/varasm.c	(revision 199897)
25c7f1
+++ gcc/varasm.c	(revision 199984)
25c7f1
@@ -966,13 +966,80 @@ align_variable (tree decl, bool dont_out
25c7f1
       align = MAX_OFILE_ALIGNMENT;
25c7f1
     }
25c7f1
 
25c7f1
-  /* On some machines, it is good to increase alignment sometimes.  */
25c7f1
   if (! DECL_USER_ALIGN (decl))
25c7f1
     {
25c7f1
+#ifdef DATA_ABI_ALIGNMENT
25c7f1
+      unsigned int data_abi_align
25c7f1
+	= DATA_ABI_ALIGNMENT (TREE_TYPE (decl), align);
25c7f1
+      /* For backwards compatibility, don't assume the ABI alignment for
25c7f1
+	 TLS variables.  */
25c7f1
+      if (! DECL_THREAD_LOCAL_P (decl) || data_abi_align <= BITS_PER_WORD)
25c7f1
+	align = data_abi_align;
25c7f1
+#endif
25c7f1
+
25c7f1
+      /* On some machines, it is good to increase alignment sometimes.
25c7f1
+	 But as DECL_ALIGN is used both for actually emitting the variable
25c7f1
+	 and for code accessing the variable as guaranteed alignment, we
25c7f1
+	 can only increase the alignment if it is a performance optimization
25c7f1
+	 if the references to it must bind to the current definition.  */
25c7f1
+      if (decl_binds_to_current_def_p (decl))
25c7f1
+	{
25c7f1
+#ifdef DATA_ALIGNMENT
25c7f1
+	  unsigned int data_align = DATA_ALIGNMENT (TREE_TYPE (decl), align);
25c7f1
+	  /* Don't increase alignment too much for TLS variables - TLS space
25c7f1
+	     is too precious.  */
25c7f1
+	  if (! DECL_THREAD_LOCAL_P (decl) || data_align <= BITS_PER_WORD)
25c7f1
+	    align = data_align;
25c7f1
+#endif
25c7f1
+#ifdef CONSTANT_ALIGNMENT
25c7f1
+	  if (DECL_INITIAL (decl) != 0
25c7f1
+	      && DECL_INITIAL (decl) != error_mark_node)
25c7f1
+	    {
25c7f1
+	      unsigned int const_align
25c7f1
+		= CONSTANT_ALIGNMENT (DECL_INITIAL (decl), align);
25c7f1
+	      /* Don't increase alignment too much for TLS variables - TLS
25c7f1
+		 space is too precious.  */
25c7f1
+	      if (! DECL_THREAD_LOCAL_P (decl) || const_align <= BITS_PER_WORD)
25c7f1
+		align = const_align;
25c7f1
+	    }
25c7f1
+#endif
25c7f1
+	}
25c7f1
+    }
25c7f1
+
25c7f1
+  /* Reset the alignment in case we have made it tighter, so we can benefit
25c7f1
+     from it in get_pointer_alignment.  */
25c7f1
+  DECL_ALIGN (decl) = align;
25c7f1
+}
25c7f1
+
25c7f1
+/* Return DECL_ALIGN (decl), possibly increased for optimization purposes
25c7f1
+   beyond what align_variable returned.  */
25c7f1
+
25c7f1
+static unsigned int
25c7f1
+get_variable_align (tree decl)
25c7f1
+{
25c7f1
+  unsigned int align = DECL_ALIGN (decl);
25c7f1
+
25c7f1
+  /* For user aligned vars or static vars align_variable already did
25c7f1
+     everything.  */
25c7f1
+  if (DECL_USER_ALIGN (decl) || !TREE_PUBLIC (decl))
25c7f1
+    return align;
25c7f1
+
25c7f1
+#ifdef DATA_ABI_ALIGNMENT
25c7f1
+  if (DECL_THREAD_LOCAL_P (decl))
25c7f1
+    align = DATA_ABI_ALIGNMENT (TREE_TYPE (decl), align);
25c7f1
+#endif
25c7f1
+
25c7f1
+  /* For decls that bind to the current definition, align_variable
25c7f1
+     did also everything, except for not assuming ABI required alignment
25c7f1
+     of TLS variables.  For other vars, increase the alignment here
25c7f1
+     as an optimization.  */
25c7f1
+  if (!decl_binds_to_current_def_p (decl))
25c7f1
+    {
25c7f1
+      /* On some machines, it is good to increase alignment sometimes.  */
25c7f1
 #ifdef DATA_ALIGNMENT
25c7f1
       unsigned int data_align = DATA_ALIGNMENT (TREE_TYPE (decl), align);
25c7f1
       /* Don't increase alignment too much for TLS variables - TLS space
25c7f1
-	 is too precious.  */
25c7f1
+         is too precious.  */
25c7f1
       if (! DECL_THREAD_LOCAL_P (decl) || data_align <= BITS_PER_WORD)
25c7f1
 	align = data_align;
25c7f1
 #endif
25c7f1
@@ -989,9 +1056,7 @@ align_variable (tree decl, bool dont_out
25c7f1
 #endif
25c7f1
     }
25c7f1
 
25c7f1
-  /* Reset the alignment in case we have made it tighter, so we can benefit
25c7f1
-     from it in get_pointer_alignment.  */
25c7f1
-  DECL_ALIGN (decl) = align;
25c7f1
+  return align;
25c7f1
 }
25c7f1
 
25c7f1
 /* Return the section into which the given VAR_DECL or CONST_DECL
25c7f1
@@ -1043,7 +1108,8 @@ get_variable_section (tree decl, bool pr
25c7f1
 	return bss_noswitch_section;
25c7f1
     }
25c7f1
 
25c7f1
-  return targetm.asm_out.select_section (decl, reloc, DECL_ALIGN (decl));
25c7f1
+  return targetm.asm_out.select_section (decl, reloc,
25c7f1
+					 get_variable_align (decl));
25c7f1
 }
25c7f1
 
25c7f1
 /* Return the block into which object_block DECL should be placed.  */
25c7f1
@@ -1780,7 +1846,8 @@ emit_bss (tree decl ATTRIBUTE_UNUSED,
25c7f1
 	  unsigned HOST_WIDE_INT rounded ATTRIBUTE_UNUSED)
25c7f1
 {
25c7f1
 #if defined ASM_OUTPUT_ALIGNED_BSS
25c7f1
-  ASM_OUTPUT_ALIGNED_BSS (asm_out_file, decl, name, size, DECL_ALIGN (decl));
25c7f1
+  ASM_OUTPUT_ALIGNED_BSS (asm_out_file, decl, name, size,
25c7f1
+			  get_variable_align (decl));
25c7f1
   return true;
25c7f1
 #endif
25c7f1
 }
25c7f1
@@ -1796,10 +1863,11 @@ emit_common (tree decl ATTRIBUTE_UNUSED,
25c7f1
 {
25c7f1
 #if defined ASM_OUTPUT_ALIGNED_DECL_COMMON
25c7f1
   ASM_OUTPUT_ALIGNED_DECL_COMMON (asm_out_file, decl, name,
25c7f1
-				  size, DECL_ALIGN (decl));
25c7f1
+				  size, get_variable_align (decl));
25c7f1
   return true;
25c7f1
 #elif defined ASM_OUTPUT_ALIGNED_COMMON
25c7f1
-  ASM_OUTPUT_ALIGNED_COMMON (asm_out_file, name, size, DECL_ALIGN (decl));
25c7f1
+  ASM_OUTPUT_ALIGNED_COMMON (asm_out_file, name, size,
25c7f1
+			     get_variable_align (decl));
25c7f1
   return true;
25c7f1
 #else
25c7f1
   ASM_OUTPUT_COMMON (asm_out_file, name, size, rounded);
25c7f1
@@ -1828,7 +1896,8 @@ emit_tls_common (tree decl ATTRIBUTE_UNU
25c7f1
    NAME is the name of DECL's SYMBOL_REF.  */
25c7f1
 
25c7f1
 static void
25c7f1
-assemble_noswitch_variable (tree decl, const char *name, section *sect)
25c7f1
+assemble_noswitch_variable (tree decl, const char *name, section *sect,
25c7f1
+			    unsigned int align)
25c7f1
 {
25c7f1
   unsigned HOST_WIDE_INT size, rounded;
25c7f1
 
25c7f1
@@ -1850,7 +1919,7 @@ assemble_noswitch_variable (tree decl, c
25c7f1
 	     * (BIGGEST_ALIGNMENT / BITS_PER_UNIT));
25c7f1
 
25c7f1
   if (!sect->noswitch.callback (decl, name, size, rounded)
25c7f1
-      && (unsigned HOST_WIDE_INT) DECL_ALIGN_UNIT (decl) > rounded)
25c7f1
+      && (unsigned HOST_WIDE_INT) (align / BITS_PER_UNIT) > rounded)
25c7f1
     warning (0, "requested alignment for %q+D is greater than "
25c7f1
 	     "implemented alignment of %wu", decl, rounded);
25c7f1
 }
25c7f1
@@ -1880,7 +1949,7 @@ assemble_variable_contents (tree decl, c
25c7f1
 	/* Output the actual data.  */
25c7f1
 	output_constant (DECL_INITIAL (decl),
25c7f1
 			 tree_low_cst (DECL_SIZE_UNIT (decl), 1),
25c7f1
-			 DECL_ALIGN (decl));
25c7f1
+			 get_variable_align (decl));
25c7f1
       else
25c7f1
 	/* Leave space for it.  */
25c7f1
 	assemble_zeros (tree_low_cst (DECL_SIZE_UNIT (decl), 1));
25c7f1
@@ -1904,6 +1973,7 @@ assemble_variable (tree decl, int top_le
25c7f1
   const char *name;
25c7f1
   rtx decl_rtl, symbol;
25c7f1
   section *sect;
25c7f1
+  unsigned int align;
25c7f1
   bool asan_protected = false;
25c7f1
 
25c7f1
   /* This function is supposed to handle VARIABLES.  Ensure we have one.  */
25c7f1
@@ -2003,6 +2073,8 @@ assemble_variable (tree decl, int top_le
25c7f1
 
25c7f1
   set_mem_align (decl_rtl, DECL_ALIGN (decl));
25c7f1
 
25c7f1
+  align = get_variable_align (decl);
25c7f1
+
25c7f1
   if (TREE_PUBLIC (decl))
25c7f1
     maybe_assemble_visibility (decl);
25c7f1
 
25c7f1
@@ -2032,12 +2104,12 @@ assemble_variable (tree decl, int top_le
25c7f1
       place_block_symbol (symbol);
25c7f1
     }
25c7f1
   else if (SECTION_STYLE (sect) == SECTION_NOSWITCH)
25c7f1
-    assemble_noswitch_variable (decl, name, sect);
25c7f1
+    assemble_noswitch_variable (decl, name, sect, align);
25c7f1
   else
25c7f1
     {
25c7f1
       switch_to_section (sect);
25c7f1
-      if (DECL_ALIGN (decl) > BITS_PER_UNIT)
25c7f1
-	ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (DECL_ALIGN_UNIT (decl)));
25c7f1
+      if (align > BITS_PER_UNIT)
25c7f1
+	ASM_OUTPUT_ALIGN (asm_out_file, floor_log2 (align / BITS_PER_UNIT));
25c7f1
       assemble_variable_contents (decl, name, dont_output_data);
25c7f1
       if (asan_protected)
25c7f1
 	{
25c7f1
@@ -6709,10 +6781,10 @@ bool
25c7f1
 decl_binds_to_current_def_p (tree decl)
25c7f1
 {
25c7f1
   gcc_assert (DECL_P (decl));
25c7f1
-  if (!TREE_PUBLIC (decl))
25c7f1
-    return true;
25c7f1
   if (!targetm.binds_local_p (decl))
25c7f1
     return false;
25c7f1
+  if (!TREE_PUBLIC (decl))
25c7f1
+    return true;
25c7f1
   /* When resolution is available, just use it.  */
25c7f1
   if (TREE_CODE (decl) == VAR_DECL
25c7f1
       && (TREE_STATIC (decl) || DECL_EXTERNAL (decl)))
25c7f1
@@ -6730,10 +6802,20 @@ decl_binds_to_current_def_p (tree decl)
25c7f1
 	return resolution_to_local_definition_p (node->symbol.resolution);
25c7f1
     }
25c7f1
   /* Otherwise we have to assume the worst for DECL_WEAK (hidden weaks
25c7f1
-     binds locally but still can be overwritten).
25c7f1
+     binds locally but still can be overwritten), DECL_COMMON (can be merged
25c7f1
+     with a non-common definition somewhere in the same module) or
25c7f1
+     DECL_EXTERNAL.
25c7f1
      This rely on fact that binds_local_p behave as decl_replaceable_p
25c7f1
      for all other declaration types.  */
25c7f1
-  return !DECL_WEAK (decl);
25c7f1
+  if (DECL_WEAK (decl))
25c7f1
+    return false;
25c7f1
+  if (DECL_COMMON (decl)
25c7f1
+      && (DECL_INITIAL (decl) == NULL
25c7f1
+	  || DECL_INITIAL (decl) == error_mark_node))
25c7f1
+    return false;
25c7f1
+  if (DECL_EXTERNAL (decl))
25c7f1
+    return false;
25c7f1
+  return true;
25c7f1
 }
25c7f1
 
25c7f1
 /* A replaceable function or variable is one which may be replaced
25c7f1
@@ -6959,7 +7041,7 @@ place_block_symbol (rtx symbol)
25c7f1
   else
25c7f1
     {
25c7f1
       decl = SYMBOL_REF_DECL (symbol);
25c7f1
-      alignment = DECL_ALIGN (decl);
25c7f1
+      alignment = get_variable_align (decl);
25c7f1
       size = tree_low_cst (DECL_SIZE_UNIT (decl), 1);
25c7f1
       if (flag_asan && asan_protect_global (decl))
25c7f1
 	{
25c7f1
--- gcc/config/s390/s390.h	(revision 199897)
25c7f1
+++ gcc/config/s390/s390.h	(revision 199898)
25c7f1
@@ -221,7 +221,7 @@ enum processor_flags
25c7f1
 
25c7f1
 /* Alignment on even addresses for LARL instruction.  */
25c7f1
 #define CONSTANT_ALIGNMENT(EXP, ALIGN) (ALIGN) < 16 ? 16 : (ALIGN)
25c7f1
-#define DATA_ALIGNMENT(TYPE, ALIGN) (ALIGN) < 16 ? 16 : (ALIGN)
25c7f1
+#define DATA_ABI_ALIGNMENT(TYPE, ALIGN) (ALIGN) < 16 ? 16 : (ALIGN)
25c7f1
 
25c7f1
 /* Alignment is not required by the hardware.  */
25c7f1
 #define STRICT_ALIGNMENT 0
25c7f1
--- gcc/config/i386/i386.h	(revision 199897)
25c7f1
+++ gcc/config/i386/i386.h	(revision 199898)
25c7f1
@@ -859,7 +859,18 @@ enum target_cpu_default
25c7f1
    cause character arrays to be word-aligned so that `strcpy' calls
25c7f1
    that copy constants to character arrays can be done inline.  */
25c7f1
 
25c7f1
-#define DATA_ALIGNMENT(TYPE, ALIGN) ix86_data_alignment ((TYPE), (ALIGN))
25c7f1
+#define DATA_ALIGNMENT(TYPE, ALIGN) \
25c7f1
+  ix86_data_alignment ((TYPE), (ALIGN), true)
25c7f1
+
25c7f1
+/* Similar to DATA_ALIGNMENT, but for the cases where the ABI mandates
25c7f1
+   some alignment increase, instead of optimization only purposes.  E.g.
25c7f1
+   AMD x86-64 psABI says that variables with array type larger than 15 bytes
25c7f1
+   must be aligned to 16 byte boundaries.
25c7f1
+
25c7f1
+   If this macro is not defined, then ALIGN is used.  */
25c7f1
+
25c7f1
+#define DATA_ABI_ALIGNMENT(TYPE, ALIGN) \
25c7f1
+  ix86_data_alignment ((TYPE), (ALIGN), false)
25c7f1
 
25c7f1
 /* If defined, a C expression to compute the alignment for a local
25c7f1
    variable.  TYPE is the data type, and ALIGN is the alignment that
25c7f1
--- gcc/config/i386/i386-protos.h	(revision 199897)
25c7f1
+++ gcc/config/i386/i386-protos.h	(revision 199898)
25c7f1
@@ -207,7 +207,7 @@ extern void init_cumulative_args (CUMULA
25c7f1
 #endif	/* RTX_CODE  */
25c7f1
 
25c7f1
 #ifdef TREE_CODE
25c7f1
-extern int ix86_data_alignment (tree, int);
25c7f1
+extern int ix86_data_alignment (tree, int, bool);
25c7f1
 extern unsigned int ix86_local_alignment (tree, enum machine_mode,
25c7f1
 					  unsigned int);
25c7f1
 extern unsigned int ix86_minimum_alignment (tree, enum machine_mode,
25c7f1
--- gcc/config/i386/i386.c	(revision 199897)
25c7f1
+++ gcc/config/i386/i386.c	(revision 199898)
25c7f1
@@ -25292,12 +25292,13 @@ ix86_constant_alignment (tree exp, int a
25c7f1
    instead of that alignment to align the object.  */
25c7f1
 
25c7f1
 int
25c7f1
-ix86_data_alignment (tree type, int align)
25c7f1
+ix86_data_alignment (tree type, int align, bool opt)
25c7f1
 {
25c7f1
   int max_align
25c7f1
     = optimize_size ? BITS_PER_WORD : MIN (256, MAX_OFILE_ALIGNMENT);
25c7f1
 
25c7f1
-  if (AGGREGATE_TYPE_P (type)
25c7f1
+  if (opt
25c7f1
+      && AGGREGATE_TYPE_P (type)
25c7f1
       && TYPE_SIZE (type)
25c7f1
       && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
25c7f1
       && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= (unsigned) max_align
25c7f1
@@ -25309,14 +25310,17 @@ ix86_data_alignment (tree type, int alig
25c7f1
      to 16byte boundary.  */
25c7f1
   if (TARGET_64BIT)
25c7f1
     {
25c7f1
-      if (AGGREGATE_TYPE_P (type)
25c7f1
-	   && TYPE_SIZE (type)
25c7f1
-	   && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
25c7f1
-	   && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= 128
25c7f1
-	       || TREE_INT_CST_HIGH (TYPE_SIZE (type))) && align < 128)
25c7f1
+      if ((opt ? AGGREGATE_TYPE_P (type) : TREE_CODE (type) == ARRAY_TYPE)
25c7f1
+	  && TYPE_SIZE (type)
25c7f1
+	  && TREE_CODE (TYPE_SIZE (type)) == INTEGER_CST
25c7f1
+	  && (TREE_INT_CST_LOW (TYPE_SIZE (type)) >= 128
25c7f1
+	      || TREE_INT_CST_HIGH (TYPE_SIZE (type))) && align < 128)
25c7f1
 	return 128;
25c7f1
     }
25c7f1
 
25c7f1
+  if (!opt)
25c7f1
+    return align;
25c7f1
+
25c7f1
   if (TREE_CODE (type) == ARRAY_TYPE)
25c7f1
     {
25c7f1
       if (TYPE_MODE (TREE_TYPE (type)) == DFmode && align < 64)
25c7f1
--- gcc/config/c6x/c6x.h	(revision 199897)
25c7f1
+++ gcc/config/c6x/c6x.h	(revision 199898)
25c7f1
@@ -134,7 +134,7 @@ extern c6x_cpu_t c6x_arch;
25c7f1
    Really only externally visible arrays must be aligned this way, as
25c7f1
    only those are directly visible from another compilation unit.  But
25c7f1
    we don't have that information available here.  */
25c7f1
-#define DATA_ALIGNMENT(TYPE, ALIGN)					\
25c7f1
+#define DATA_ABI_ALIGNMENT(TYPE, ALIGN)					\
25c7f1
   (((ALIGN) < BITS_PER_UNIT * 8 && TREE_CODE (TYPE) == ARRAY_TYPE)	\
25c7f1
    ? BITS_PER_UNIT * 8 : (ALIGN))
25c7f1
 
25c7f1
--- gcc/config/mmix/mmix.h	(revision 199897)
25c7f1
+++ gcc/config/mmix/mmix.h	(revision 199898)
25c7f1
@@ -164,7 +164,7 @@ struct GTY(()) machine_function
25c7f1
 /* Copied from elfos.h.  */
25c7f1
 #define MAX_OFILE_ALIGNMENT (32768 * 8)
25c7f1
 
25c7f1
-#define DATA_ALIGNMENT(TYPE, BASIC_ALIGN) \
25c7f1
+#define DATA_ABI_ALIGNMENT(TYPE, BASIC_ALIGN) \
25c7f1
  mmix_data_alignment (TYPE, BASIC_ALIGN)
25c7f1
 
25c7f1
 #define CONSTANT_ALIGNMENT(CONSTANT, BASIC_ALIGN) \
25c7f1
--- gcc/config/mmix/mmix.c	(revision 199897)
25c7f1
+++ gcc/config/mmix/mmix.c	(revision 199898)
25c7f1
@@ -313,7 +313,7 @@ mmix_init_machine_status (void)
25c7f1
   return ggc_alloc_cleared_machine_function ();
25c7f1
 }
25c7f1
 
25c7f1
-/* DATA_ALIGNMENT.
25c7f1
+/* DATA_ABI_ALIGNMENT.
25c7f1
    We have trouble getting the address of stuff that is located at other
25c7f1
    than 32-bit alignments (GETA requirements), so try to give everything
25c7f1
    at least 32-bit alignment.  */
25c7f1
--- gcc/testsuite/gcc.target/i386/memcpy-1.c	(revision 199897)
25c7f1
+++ gcc/testsuite/gcc.target/i386/memcpy-1.c	(revision 199898)
25c7f1
@@ -1,6 +1,6 @@
25c7f1
 /* { dg-do compile } */
25c7f1
 /* { dg-require-effective-target ia32 } */
25c7f1
-/* { dg-options "-O2 -march=pentiumpro -minline-all-stringops" } */
25c7f1
+/* { dg-options "-O2 -march=pentiumpro -minline-all-stringops -fno-common" } */
25c7f1
 /* { dg-final { scan-assembler "rep" } } */
25c7f1
 /* { dg-final { scan-assembler "movs" } } */
25c7f1
 /* { dg-final { scan-assembler-not "test" } } */
25c7f1
--- gcc/testsuite/gcc.target/i386/vect-sizes-1.c	(revision 199897)
25c7f1
+++ gcc/testsuite/gcc.target/i386/vect-sizes-1.c	(revision 199898)
25c7f1
@@ -1,5 +1,5 @@
25c7f1
 /* { dg-do compile } */
25c7f1
-/* { dg-options "-O3 -ffast-math -mavx -mtune=generic" } */
25c7f1
+/* { dg-options "-O3 -ffast-math -mavx -mtune=generic -fno-common" } */
25c7f1
 
25c7f1
 double a[1024];
25c7f1
 
25c7f1
--- gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c	(revision 199897)
25c7f1
+++ gcc/testsuite/gcc.target/i386/avx256-unaligned-load-4.c	(revision 199898)
25c7f1
@@ -1,5 +1,5 @@
25c7f1
 /* { dg-do compile } */
25c7f1
-/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store" } */
25c7f1
+/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store -fno-common" } */
25c7f1
 
25c7f1
 #define N 1024
25c7f1
 
25c7f1
--- gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c	(revision 199897)
25c7f1
+++ gcc/testsuite/gcc.target/i386/avx256-unaligned-store-1.c	(revision 199898)
25c7f1
@@ -1,5 +1,5 @@
25c7f1
 /* { dg-do compile } */
25c7f1
-/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store" } */
25c7f1
+/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store -fno-common" } */
25c7f1
 
25c7f1
 #define N 1024
25c7f1
 
25c7f1
--- gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c	(revision 199897)
25c7f1
+++ gcc/testsuite/gcc.target/i386/avx256-unaligned-store-3.c	(revision 199898)
25c7f1
@@ -1,5 +1,5 @@
25c7f1
 /* { dg-do compile } */
25c7f1
-/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store -mtune=generic" } */
25c7f1
+/* { dg-options "-O3 -dp -mavx -mavx256-split-unaligned-store -mtune=generic -fno-common" } */
25c7f1
 
25c7f1
 #define N 1024
25c7f1
 
25c7f1
--- gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c	(revision 199897)
25c7f1
+++ gcc/testsuite/gcc.target/i386/avx256-unaligned-store-4.c	(revision 199898)
25c7f1
@@ -1,5 +1,5 @@
25c7f1
 /* { dg-do compile } */
25c7f1
-/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store" } */
25c7f1
+/* { dg-options "-O3 -dp -mavx -mno-avx256-split-unaligned-load -mno-avx256-split-unaligned-store -fno-common" } */
25c7f1
 
25c7f1
 #define N 1024
25c7f1
 
25c7f1
--- gcc/testsuite/gcc.target/i386/pr56564-1.c	(revision 0)
25c7f1
+++ gcc/testsuite/gcc.target/i386/pr56564-1.c	(revision 199985)
25c7f1
@@ -0,0 +1,26 @@
25c7f1
+/* PR target/56564 */
25c7f1
+/* { dg-do compile { target { fpic && lp64 } } } */
25c7f1
+/* { dg-skip-if "No symbol interposition for PIC" { *-*-mingw* *-*-cygwin* *-*-darwin* } } */
25c7f1
+/* { dg-options "-O3 -fpic -fdump-tree-optimized" } */
25c7f1
+
25c7f1
+struct S { long a, b; } s = { 5, 6 };
25c7f1
+char t[16] = { 7 };
25c7f1
+
25c7f1
+int
25c7f1
+foo (void)
25c7f1
+{
25c7f1
+  return ((__UINTPTR_TYPE__) &s) & 15;
25c7f1
+}
25c7f1
+
25c7f1
+int
25c7f1
+bar (void)
25c7f1
+{
25c7f1
+  return ((__UINTPTR_TYPE__) &t[0]) & 15;
25c7f1
+}
25c7f1
+
25c7f1
+/* { dg-final { scan-tree-dump-times "&s" 1 "optimized" } } */
25c7f1
+/* { dg-final { scan-tree-dump-times "&t" 0 "optimized" } } */
25c7f1
+/* { dg-final { scan-tree-dump-times "return 0" 1 "optimized" } } */
25c7f1
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
25c7f1
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
25c7f1
+/* { dg-final { cleanup-tree-dump "optimized" } } */
25c7f1
--- gcc/testsuite/gcc.target/i386/pr56564-2.c	(revision 0)
25c7f1
+++ gcc/testsuite/gcc.target/i386/pr56564-2.c	(revision 199898)
25c7f1
@@ -0,0 +1,25 @@
25c7f1
+/* PR target/56564 */
25c7f1
+/* { dg-do compile { target { *-*-linux* && lp64 } } } */
25c7f1
+/* { dg-options "-O3 -fno-pic -fdump-tree-optimized" } */
25c7f1
+
25c7f1
+struct S { long a, b; } s = { 5, 6 };
25c7f1
+char t[16] = { 7 };
25c7f1
+
25c7f1
+int
25c7f1
+foo (void)
25c7f1
+{
25c7f1
+  return ((__UINTPTR_TYPE__) &s) & 15;
25c7f1
+}
25c7f1
+
25c7f1
+int
25c7f1
+bar (void)
25c7f1
+{
25c7f1
+  return ((__UINTPTR_TYPE__) &t[0]) & 15;
25c7f1
+}
25c7f1
+
25c7f1
+/* { dg-final { scan-tree-dump-times "&s" 0 "optimized" } } */
25c7f1
+/* { dg-final { scan-tree-dump-times "&t" 0 "optimized" } } */
25c7f1
+/* { dg-final { scan-tree-dump-times "return 0" 2 "optimized" } } */
25c7f1
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
25c7f1
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
25c7f1
+/* { dg-final { cleanup-tree-dump "optimized" } } */
25c7f1
--- gcc/testsuite/gcc.target/i386/pr56564-3.c	(revision 0)
25c7f1
+++ gcc/testsuite/gcc.target/i386/pr56564-3.c	(revision 199985)
25c7f1
@@ -0,0 +1,29 @@
25c7f1
+/* PR target/56564 */
25c7f1
+/* { dg-do compile { target { fpic && lp64 } } } */
25c7f1
+/* { dg-skip-if "No symbol interposition for PIC" { *-*-mingw* *-*-cygwin* *-*-darwin* } } */
25c7f1
+/* { dg-options "-O3 -fpic -fdump-tree-optimized" } */
25c7f1
+
25c7f1
+__thread struct S { long a, b; } s = { 5, 6 };
25c7f1
+__thread char t[16] = { 7 };
25c7f1
+
25c7f1
+int
25c7f1
+foo (void)
25c7f1
+{
25c7f1
+  return ((__UINTPTR_TYPE__) &s) & 15;
25c7f1
+}
25c7f1
+
25c7f1
+/* For backwards compatibility we don't assume that t must
25c7f1
+   be aligned to 16 bytes, but align it anyway.  */
25c7f1
+
25c7f1
+int
25c7f1
+bar (void)
25c7f1
+{
25c7f1
+  return ((__UINTPTR_TYPE__) &t[0]) & 15;
25c7f1
+}
25c7f1
+
25c7f1
+/* { dg-final { scan-tree-dump-times "&s" 1 "optimized" } } */
25c7f1
+/* { dg-final { scan-tree-dump-times "&t" 1 "optimized" } } */
25c7f1
+/* { dg-final { scan-tree-dump-times "return 0" 0 "optimized" } } */
25c7f1
+/* { dg-final { scan-assembler-not ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
25c7f1
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
25c7f1
+/* { dg-final { cleanup-tree-dump "optimized" } } */
25c7f1
--- gcc/testsuite/gcc.target/i386/pr56564-4.c	(revision 0)
25c7f1
+++ gcc/testsuite/gcc.target/i386/pr56564-4.c	(revision 199898)
25c7f1
@@ -0,0 +1,22 @@
25c7f1
+/* PR target/56564 */
25c7f1
+/* { dg-do compile { target { *-*-linux* && lp64 } } } */
25c7f1
+/* { dg-options "-O3 -fno-pic -fdump-tree-optimized" } */
25c7f1
+
25c7f1
+__thread struct S { long a, b; } s = { 5, 6 };
25c7f1
+__thread char t[16] = { 7 };
25c7f1
+
25c7f1
+int
25c7f1
+foo (void)
25c7f1
+{
25c7f1
+  return ((__UINTPTR_TYPE__) &s) & 15;
25c7f1
+}
25c7f1
+
25c7f1
+int
25c7f1
+bar (void)
25c7f1
+{
25c7f1
+  return ((__UINTPTR_TYPE__) &t[0]) & 15;
25c7f1
+}
25c7f1
+
25c7f1
+/* { dg-final { scan-assembler-not ".align\[ \t]*16\[^:]*\[\n\r]s:" { target { *-*-linux* } } } } */
25c7f1
+/* { dg-final { scan-assembler ".align\[ \t]*16\[^:]*\[\n\r]t:" { target { *-*-linux* } } } } */
25c7f1
+/* { dg-final { cleanup-tree-dump "optimized" } } */
25c7f1
--- gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-31.c	(revision 199897)
25c7f1
+++ gcc/testsuite/gcc.dg/vect/costmodel/i386/costmodel-vect-31.c	(revision 199898)
25c7f1
@@ -18,7 +18,7 @@ struct s{
25c7f1
   struct t e;   /* unaligned (offset 2N+4N+4 B) */
25c7f1
 };
25c7f1
  
25c7f1
-struct s tmp;
25c7f1
+struct s tmp = { 1 };
25c7f1
 
25c7f1
 int main1 ()
25c7f1
 {  
25c7f1
--- gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c	(revision 199897)
25c7f1
+++ gcc/testsuite/gcc.dg/vect/costmodel/x86_64/costmodel-vect-31.c	(revision 199898)
25c7f1
@@ -18,7 +18,7 @@ struct s{
25c7f1
   struct t e;   /* unaligned (offset 2N+4N+4 B) */
25c7f1
 };
25c7f1
  
25c7f1
-struct s tmp;
25c7f1
+struct s tmp = { 1 };
25c7f1
 
25c7f1
 int main1 ()
25c7f1
 {  
25c7f1
--- gcc/testsuite/gcc.dg/tree-ssa/loop-19.c	(revision 200212)
25c7f1
+++ gcc/testsuite/gcc.dg/tree-ssa/loop-19.c	(revision 200213)
25c7f1
@@ -6,7 +6,7 @@
25c7f1
 
25c7f1
 /* { dg-do compile { target { i?86-*-* || { x86_64-*-* || powerpc_hard_double } } } } */
25c7f1
 /* { dg-require-effective-target nonpic } */
25c7f1
-/* { dg-options "-O3 -fno-tree-loop-distribute-patterns -fno-prefetch-loop-arrays -fdump-tree-optimized" } */
25c7f1
+/* { dg-options "-O3 -fno-tree-loop-distribute-patterns -fno-prefetch-loop-arrays -fdump-tree-optimized -fno-common" } */
25c7f1
 
25c7f1
 # define N      2000000
25c7f1
 double   a[N],c[N];