Blame SOURCES/gcc48-pr56564.patch

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