S/390: Use !lp64 instead of -m31 cmdline option.

2015-03-12  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

        Backport from mainline
        2015-02-27  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>

	* gcc.target/s390/20140327-1.c: Remove -m31 and guard with ! lp64.
	* gcc.target/s390/hotpatch-8.c: Likewise.
	* gcc.target/s390/hotpatch-9.c: Likewise.
	* gcc.target/s390/pr57960.c: Remove -m64.
	* gcc.target/s390/pr57559.c: Likewise.

From-SVN: r221384

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index ed9fda97b30f4a9a154e36c2cf81b3c31cd9fc38..0d47e0fcb5a3000df9dc5e2246d3f1652f4f1a11 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,14 @@
+2015-03-12  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       Backport from mainline
+        2015-02-27  Andreas Krebbel  <Andreas.Krebbel@de.ibm.com>
+
+       * gcc.target/s390/20140327-1.c: Remove -m31 and guard with ! lp64.
+       * gcc.target/s390/hotpatch-8.c: Likewise.
+       * gcc.target/s390/hotpatch-9.c: Likewise.
+       * gcc.target/s390/pr57960.c: Remove -m64.
+       * gcc.target/s390/pr57559.c: Likewise.
+
 2015-03-11  Marek Polacek  <polacek@redhat.com>
 
        Backported from mainline

diff --git a/gcc/testsuite/gcc.target/s390/20140327-1.c b/gcc/testsuite/gcc.target/s390/20140327-1.c
index f71c38f0909139aa517c36f7ce748ab18e388f11..25c7391377212e989cb8e9bd6f6582974fb8c1c5 100644 (file)
--- a/gcc/testsuite/gcc.target/s390/20140327-1.c
+++ b/gcc/testsuite/gcc.target/s390/20140327-1.c
@@ -1,5 +1,5 @@
-/* { dg-do compile } */
-/* { dg-options "-O3 -m31 -mzarch" } */
+/* { dg-do compile { target { ! lp64 } } } */
+/* { dg-options "-O3 -mzarch" } */
 
 void
 foo ()

diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-8.c b/gcc/testsuite/gcc.target/s390/hotpatch-8.c
index 0874bbc5ce7fc7d0331caf1f4467ed84f80cc33d..25edd9b0ed224306ef41ce00a0a4f056aea17b9c 100644 (file)
--- a/gcc/testsuite/gcc.target/s390/hotpatch-8.c
+++ b/gcc/testsuite/gcc.target/s390/hotpatch-8.c
@@ -1,7 +1,7 @@
 /* Functional tests for the function hotpatching feature.  */
 
-/* { dg-do compile } */
-/* { dg-options "-O3 -mesa -m31 -march=g5 -mhotpatch=0,3" } */
+/* { dg-do compile { target { ! lp64 } } } */
+/* { dg-options "-O3 -mesa -march=g5 -mhotpatch=0,3" } */
 
 #include <stdio.h>
 

diff --git a/gcc/testsuite/gcc.target/s390/hotpatch-9.c b/gcc/testsuite/gcc.target/s390/hotpatch-9.c
index d6fb29ae274fa5b0bea6fee01dcb2f39a9891722..2143f9d42803ac9d13ddcd6860860121ac2518c2 100644 (file)
--- a/gcc/testsuite/gcc.target/s390/hotpatch-9.c
+++ b/gcc/testsuite/gcc.target/s390/hotpatch-9.c
@@ -1,7 +1,7 @@
 /* Functional tests for the function hotpatching feature.  */
 
-/* { dg-do compile } */
-/* { dg-options "-O3 -mesa -m31 -march=g5 -mhotpatch=0,4" } */
+/* { dg-do compile { target { ! lp64 } } } */
+/* { dg-options "-O3 -mesa -march=g5 -mhotpatch=0,4" } */
 
 #include <stdio.h>
 

diff --git a/gcc/testsuite/gcc.target/s390/pr57559.c b/gcc/testsuite/gcc.target/s390/pr57559.c
index 15c3878c4cfaa4154641f7d5ce612774db7238de..1c62f569f77f6206801c1c2e666bf16da9485515 100644 (file)
--- a/gcc/testsuite/gcc.target/s390/pr57559.c
+++ b/gcc/testsuite/gcc.target/s390/pr57559.c
@@ -1,7 +1,7 @@
 /* PR rtl-optimization/57559  */
 
 /* { dg-do compile } */
-/* { dg-options "-march=z10 -m64 -mzarch  -O1" } */
+/* { dg-options "-march=z10 -mzarch  -O1" } */
 
 typedef int int32_t;
 typedef unsigned char uint8_t;

diff --git a/gcc/testsuite/gcc.target/s390/pr57960.c b/gcc/testsuite/gcc.target/s390/pr57960.c
index ee751edc842344a3cdbdfeb9a54acbb247f26c5a..03578ff76795aaf94e4174f68750bc616e34439a 100644 (file)
--- a/gcc/testsuite/gcc.target/s390/pr57960.c
+++ b/gcc/testsuite/gcc.target/s390/pr57960.c
@@ -1,7 +1,7 @@
 /* PR rtl-optimization/57960  */
 
 /* { dg-do compile } */
-/* { dg-options "-march=z10 -m64 -mzarch  -O1" } */
+/* { dg-options "-march=z10 -mzarch  -O1" } */
 
 typedef union
 {