rs6000-protos.h (rs6000_special_adjust_field_align_p): Add prototype.

gcc/

	* config/rs6000/rs6000-protos.h (rs6000_special_adjust_field_align_p):
	Add prototype.
	* config/rs6000/rs6000.c (rs6000_special_adjust_field_align_p): New
	function.  Issue -Wpsabi warning if future GCC releases will use
	different field alignment rules for this type.
	* config/rs6000/sysv4.h (ADJUST_FIELD_ALIGN): Call it.
	* config/rs6000/linux64.h (ADJUST_FIELD_ALIGN): Likewise.
	* config/rs6000/freebsd64.h (ADJUST_FIELD_ALIGN): Likewise.

gcc/testsuite/

	* gcc.target/powerpc/ppc64-abi-warn-3.c: New test.

	* gcc.c-torture/execute/20050316-1.x: Add -Wno-psabi.
	* gcc.c-torture/execute/20050604-1.x: Add -Wno-psabi.
	* gcc.c-torture/execute/20050316-3.x: New file.  Add -Wno-psabi.
	* gcc.c-torture/execute/pr23135.x: Likewise.

From-SVN: r213025

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index bdec5df39867e8163140280f377e3baf66a0a5c8..94152802473eda8666137e44d1971afc67513e18 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,14 @@
+2014-07-24  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+       * config/rs6000/rs6000-protos.h (rs6000_special_adjust_field_align_p):
+       Add prototype.
+       * config/rs6000/rs6000.c (rs6000_special_adjust_field_align_p): New
+       function.  Issue -Wpsabi warning if future GCC releases will use
+       different field alignment rules for this type.
+       * config/rs6000/sysv4.h (ADJUST_FIELD_ALIGN): Call it.
+       * config/rs6000/linux64.h (ADJUST_FIELD_ALIGN): Likewise.
+       * config/rs6000/freebsd64.h (ADJUST_FIELD_ALIGN): Likewise.
+
 2014-07-24  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
        * config/rs6000/rs6000.c (rs6000_function_arg_boundary): Issue

diff --git a/gcc/config/rs6000/freebsd64.h b/gcc/config/rs6000/freebsd64.h
index b764f763dc2af030811434b85b6d1ac4e3e9dac0..cab1f0094d99657c9e915c5abe7bca5f5878ffdc 100644 (file)
--- a/gcc/config/rs6000/freebsd64.h
+++ b/gcc/config/rs6000/freebsd64.h
@@ -367,7 +367,7 @@ extern int dot_symbols;
 /* PowerPC64 Linux word-aligns FP doubles when -malign-power is given.  */
 #undef  ADJUST_FIELD_ALIGN
 #define ADJUST_FIELD_ALIGN(FIELD, COMPUTED) \
-  ((TARGET_ALTIVEC && TREE_CODE (TREE_TYPE (FIELD)) == VECTOR_TYPE)     \
+  (rs6000_special_adjust_field_align_p ((FIELD), (COMPUTED))           \
    ? 128                                                                \
    : (TARGET_64BIT                                                      \
       && TARGET_ALIGN_NATURAL == 0                                      \

diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
index c598af1124ac51cb7d6ae914e9a2f52a490d7242..1f4e20b03f3ca391726bb49211daf725586662f4 100644 (file)
--- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h
@@ -246,7 +246,7 @@ extern int dot_symbols;
 /* PowerPC64 Linux word-aligns FP doubles when -malign-power is given.  */
 #undef  ADJUST_FIELD_ALIGN
 #define ADJUST_FIELD_ALIGN(FIELD, COMPUTED) \
-  ((TARGET_ALTIVEC && TREE_CODE (TREE_TYPE (FIELD)) == VECTOR_TYPE)    \
+  (rs6000_special_adjust_field_align_p ((FIELD), (COMPUTED))           \
    ? 128                                                               \
    : (TARGET_64BIT                                                     \
       && TARGET_ALIGN_NATURAL == 0                                     \

diff --git a/gcc/config/rs6000/rs6000-protos.h b/gcc/config/rs6000/rs6000-protos.h
index d330951bf852f3afa27cba0992daa5a825ad6c9a..02d2c3bd72703cd0a5ae3e206809f9f1ed9574dd 100644 (file)
--- a/gcc/config/rs6000/rs6000-protos.h
+++ b/gcc/config/rs6000/rs6000-protos.h
@@ -153,6 +153,7 @@ extern void rs6000_split_logical (rtx [], enum rtx_code, bool, bool, bool, rtx);
 
 #ifdef TREE_CODE
 extern unsigned int rs6000_data_alignment (tree, unsigned int, enum data_align);
+extern bool rs6000_special_adjust_field_align_p (tree, unsigned int);
 extern unsigned int rs6000_special_round_type_align (tree, unsigned int,
                                                     unsigned int);
 extern unsigned int darwin_rs6000_special_round_type_align (tree, unsigned int,

diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index 199e36b513dfb6c7b9e297fc4b70c28a4e1aba92..b40218da009704ce1aa1f9cedc1099b6b735e803 100644 (file)
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -5862,6 +5862,34 @@ rs6000_data_alignment (tree type, unsigned int align, enum data_align how)
   return align;
 }
 
+/* Previous GCC releases forced all vector types to have 16-byte alignment.  */
+
+bool
+rs6000_special_adjust_field_align_p (tree field, unsigned int computed)
+{
+  if (TARGET_ALTIVEC && TREE_CODE (TREE_TYPE (field)) == VECTOR_TYPE)
+    {
+      if (computed != 128)
+       {
+         static bool warned;
+         if (!warned && warn_psabi)
+           {
+             warned = true;
+             inform (input_location,
+                     "the layout of aggregates containing vectors with"
+                     " %d-byte alignment will change in a future GCC release",
+                     computed / BITS_PER_UNIT);
+           }
+       }
+      /* GCC 4.8/4.9 Note: To avoid any ABI change on a release branch, we
+        keep the special treatment of vector types, but warn if there will
+        be differences in future GCC releases.  */
+      return true;
+    }
+
+  return false;
+}
+
 /* AIX increases natural record alignment to doubleword if the first
    field is an FP double while the FP fields remain word aligned.  */
 

diff --git a/gcc/config/rs6000/sysv4.h b/gcc/config/rs6000/sysv4.h
index df54b4e519230845caf2232a82f24d7852cb77f5..05c90643ce55afc730f61b0fbb66f84cf4acd8a0 100644 (file)
--- a/gcc/config/rs6000/sysv4.h
+++ b/gcc/config/rs6000/sysv4.h
@@ -292,7 +292,7 @@ do {                                                                        \
 /* An expression for the alignment of a structure field FIELD if the
    alignment computed in the usual way is COMPUTED.  */
 #define ADJUST_FIELD_ALIGN(FIELD, COMPUTED)                                  \
-       ((TARGET_ALTIVEC && TREE_CODE (TREE_TYPE (FIELD)) == VECTOR_TYPE)     \
+       (rs6000_special_adjust_field_align_p ((FIELD), (COMPUTED))            \
         ? 128 : COMPUTED)
 
 #undef  BIGGEST_FIELD_ALIGNMENT

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 5ed916b004cabb3aecd2149a0193726c98e69431..37d3e92afabc8ea05a79195e4eaacbdc6e1cd96c 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2014-07-24  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+       Backport from mainline:
+       2014-07-24  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
+
+       * gcc.target/powerpc/ppc64-abi-warn-3.c: New test.
+
+       * gcc.c-torture/execute/20050316-1.x: Add -Wno-psabi.
+       * gcc.c-torture/execute/20050604-1.x: Add -Wno-psabi.
+       * gcc.c-torture/execute/20050316-3.x: New file.  Add -Wno-psabi.
+       * gcc.c-torture/execute/pr23135.x: Likewise.
+
 2014-07-24  Ulrich Weigand  <Ulrich.Weigand@de.ibm.com>
 
        Backport from mainline:

diff --git a/gcc/testsuite/gcc.c-torture/execute/20050316-1.x b/gcc/testsuite/gcc.c-torture/execute/20050316-1.x
index 121fcfecc2c22fd274926e06105d20e909831f99..cb2d28fd9fc9f71196a860a34e9189664064134d 100644 (file)
--- a/gcc/testsuite/gcc.c-torture/execute/20050316-1.x
+++ b/gcc/testsuite/gcc.c-torture/execute/20050316-1.x
@@ -4,4 +4,5 @@ if { [check_effective_target_int16] } {
        return 1
 }
 
+set additional_flags "-Wno-psabi"
 return 0;

diff --git a/gcc/testsuite/gcc.c-torture/execute/20050316-3.x b/gcc/testsuite/gcc.c-torture/execute/20050316-3.x
new file mode 100644 (file)
index 0000000..cb7b119
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/20050316-3.x
@@ -0,0 +1,2 @@
+set additional_flags "-Wno-psabi"
+return 0

diff --git a/gcc/testsuite/gcc.c-torture/execute/20050604-1.x b/gcc/testsuite/gcc.c-torture/execute/20050604-1.x
index f5b4aaae3d9696c8f426f031810b6bc9771656ad..756242d23450da0daff95528b6c912b9b3581707 100644 (file)
--- a/gcc/testsuite/gcc.c-torture/execute/20050604-1.x
+++ b/gcc/testsuite/gcc.c-torture/execute/20050604-1.x
@@ -6,4 +6,5 @@ if { [istarget "i?86-*-*"] || [istarget "x86_64-*-*"] } {
        set additional_flags "-mno-mmx"
 }
 
+set additional_flags "-Wno-psabi"
 return 0

diff --git a/gcc/testsuite/gcc.c-torture/execute/pr23135.x b/gcc/testsuite/gcc.c-torture/execute/pr23135.x
new file mode 100644 (file)
index 0000000..cb7b119
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/execute/pr23135.x
@@ -0,0 +1,2 @@
+set additional_flags "-Wno-psabi"
+return 0

diff --git a/gcc/testsuite/gcc.target/powerpc/ppc64-abi-warn-3.c b/gcc/testsuite/gcc.target/powerpc/ppc64-abi-warn-3.c
new file mode 100644 (file)
index 0000000..830de6b
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/ppc64-abi-warn-3.c
@@ -0,0 +1,9 @@
+/* { dg-do compile { target { powerpc*-*-linux* && lp64 } } } */
+/* { dg-require-effective-target powerpc_altivec_ok } */
+/* { dg-options "-maltivec" } */
+
+struct test
+  {
+    int a __attribute__((vector_size (8)));
+  }; /* { dg-message "note: the layout of aggregates containing vectors with 8-byte alignment will change" } */
+