aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2016-03-30 12:35:50 +0000
committerJakub Jelinek <jakub@redhat.com>2016-03-30 12:35:50 +0000
commitcc0ff3253e4adaa959b3f4f8a7ee8eafe7b28b2b (patch)
tree636a73375bef4fbf974f49d8a0f08b778ba22ba7
parent4a690c272e4c02651e5fa6968953ad36e1b73ae7 (diff)
Backported from mainline
2016-02-26 Jakub Jelinek <jakub@redhat.com> PR target/69969 * config/rs6000/rs6000.c (rs6000_option_override_internal): Don't complain about -mallow-movmisalign without -mvsx if TARGET_ALLOW_MOVMISALIGN was not set explicitly. * gcc.target/powerpc/pr69969.c: New test. git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gcc-5-branch@234556 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/rs6000/rs6000.c3
-rw-r--r--gcc/testsuite/ChangeLog3
-rw-r--r--gcc/testsuite/gcc.target/powerpc/pr69969.c7
4 files changed, 19 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f2169193781..b11e7ad2530 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -2,6 +2,13 @@
Backported from mainline
2016-02-26 Jakub Jelinek <jakub@redhat.com>
+
+ PR target/69969
+ * config/rs6000/rs6000.c (rs6000_option_override_internal): Don't
+ complain about -mallow-movmisalign without -mvsx if
+ TARGET_ALLOW_MOVMISALIGN was not set explicitly.
+
+ 2016-02-26 Jakub Jelinek <jakub@redhat.com>
Eric Botcazou <ebotcazou@adacore.com>
PR rtl-optimization/69891
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index b870c23bac3..c96a8c47658 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -3701,7 +3701,8 @@ rs6000_option_override_internal (bool global_init_p)
else if (TARGET_ALLOW_MOVMISALIGN && !TARGET_VSX)
{
- if (TARGET_ALLOW_MOVMISALIGN > 0)
+ if (TARGET_ALLOW_MOVMISALIGN > 0
+ && global_options_set.x_TARGET_ALLOW_MOVMISALIGN)
error ("-mallow-movmisalign requires -mvsx");
TARGET_ALLOW_MOVMISALIGN = 0;
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index eccea5a7cd2..082f79f1cc7 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -3,6 +3,9 @@
Backported from mainline
2016-02-26 Jakub Jelinek <jakub@redhat.com>
+ PR target/69969
+ * gcc.target/powerpc/pr69969.c: New test.
+
PR rtl-optimization/69891
* gcc.target/i386/pr69891.c: New test.
diff --git a/gcc/testsuite/gcc.target/powerpc/pr69969.c b/gcc/testsuite/gcc.target/powerpc/pr69969.c
new file mode 100644
index 00000000000..1ca2c7581ef
--- /dev/null
+++ b/gcc/testsuite/gcc.target/powerpc/pr69969.c
@@ -0,0 +1,7 @@
+/* PR target/69969 */
+/* { dg-do compile } */
+/* { dg-skip-if "do not override -mcpu" { powerpc*-*-* } { "-mcpu=*" } { "-mcpu=power8" } } */
+/* { dg-options "-mcpu=power8" } */
+
+int bar (int x) { return x; }
+__attribute__((__target__("no-vsx"))) int foo (int x) { return x; } /* { dg-bogus "-mallow-movmisalign requires -mvsx" } */