Blame SOURCES/gcc48-pr56564.patch

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