Hi, the attached patch gets rid of -m64/-m31 uses in our target specific testcases in order to make "make check RUNTESTFLAGS='--target_board=unix\{-m31,-m64\}'" runs work fine again.
Committed to mainline. Bye, -Andreas- 2015-02-27 Andreas Krebbel <andreas.kreb...@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/pr61078.c: Likewise. * gcc.target/s390/pr57960.c: Remove -m64. * gcc.target/s390/pr61078.c: Likewise. diff --git a/gcc/testsuite/gcc.target/s390/20140327-1.c b/gcc/testsuite/gcc.target/s390/20140327-1.c index f71c38f..25c7391 100644 --- 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 0874bbc..25edd9b 100644 --- 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 d6fb29a..2143f9d 100644 --- 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 15c3878..1c62f56 100644 --- 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 ee751ed..03578ff 100644 --- 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 { diff --git a/gcc/testsuite/gcc.target/s390/pr61078.c b/gcc/testsuite/gcc.target/s390/pr61078.c index 2f95eba..40f6ad7 100644 --- a/gcc/testsuite/gcc.target/s390/pr61078.c +++ b/gcc/testsuite/gcc.target/s390/pr61078.c @@ -1,8 +1,8 @@ /* This testcase is extracted from s390_emit_prologue. The negation of a 64bit value got split incorrectly on 31 bit. */ -/* { dg-do run } */ -/* { dg-options "-O2 -mesa -m31" } */ +/* { dg-do run { target { ! lp64 } } } */ +/* { dg-options "-O2 -mesa" } */ extern void abort (void);