A few tests need not be restricted to 'lp64', so remove the restriction. A few of those need a simple change to the DejaGnu directives to suppress '-mcmodel' flags for '-m32'.
2022-04-18 Paul A. Clarke <p...@us.ibm.com> gcc/testsuite * g++.target/powerpc/pr65240-1.C: Adjust DejaGnu directives. * g++.target/powerpc/pr65240-2.C: Likewise. * g++.target/powerpc/pr65240-3.C: Likewise. * g++.target/powerpc/pr65240-4.C: Likewise. * g++.target/powerpc/pr65242.C: Likewise. * g++.target/powerpc/pr67211.C: Likewise. * g++.target/powerpc/pr69667.C: Likewise. * g++.target/powerpc/pr71294.C: Likewise. --- gcc/testsuite/g++.target/powerpc/pr65240-1.C | 5 +++-- gcc/testsuite/g++.target/powerpc/pr65240-2.C | 5 +++-- gcc/testsuite/g++.target/powerpc/pr65240-3.C | 5 +++-- gcc/testsuite/g++.target/powerpc/pr65240-4.C | 3 ++- gcc/testsuite/g++.target/powerpc/pr65242.C | 3 ++- gcc/testsuite/g++.target/powerpc/pr67211.C | 3 ++- gcc/testsuite/g++.target/powerpc/pr69667.C | 3 ++- gcc/testsuite/g++.target/powerpc/pr71294.C | 2 +- 8 files changed, 18 insertions(+), 11 deletions(-) diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-1.C b/gcc/testsuite/g++.target/powerpc/pr65240-1.C index f735a1f7834a..40682d5fe857 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-1.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-1.C @@ -1,7 +1,8 @@ -/* { dg-do compile { target lp64 } } */ +/* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=small -mno-fp-in-toc -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mno-fp-in-toc -Wno-return-type" } */ +/* { dg-additional-options "-mcmodel=small" { target lp64 } } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-2.C b/gcc/testsuite/g++.target/powerpc/pr65240-2.C index e201e3a74d71..4e4a1c2bb897 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-2.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-2.C @@ -1,7 +1,8 @@ -/* { dg-do compile { target lp64 } } */ +/* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=small -mfp-in-toc -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mfp-in-toc -Wno-return-type" } */ +/* { dg-additional-options "-mcmodel=small" { target lp64 } } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-3.C b/gcc/testsuite/g++.target/powerpc/pr65240-3.C index 0821f68a5cf9..6acd278cab50 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-3.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-3.C @@ -1,7 +1,8 @@ -/* { dg-do compile { target lp64 } } */ +/* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ -/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -mcmodel=medium -Wno-return-type" } */ +/* { dg-options "-mdejagnu-cpu=power8 -O3 -ffast-math -Wno-return-type" } */ +/* { dg-additional-options "-mcmodel=medium" { target lp64 } } */ /* target/65240, compiler got a 'insn does not satisfy its constraints' error. */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65240-4.C b/gcc/testsuite/g++.target/powerpc/pr65240-4.C index 92d31acb20d9..57f2c769a3f3 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65240-4.C +++ b/gcc/testsuite/g++.target/powerpc/pr65240-4.C @@ -1,4 +1,5 @@ -/* { dg-do compile { target lp64 } } */ +/* { dg-do compile } */ +/* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_vsx_ok } */ /* { dg-options "-mdejagnu-cpu=power7 -O3 -ffast-math -Wno-return-type" } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr65242.C b/gcc/testsuite/g++.target/powerpc/pr65242.C index b2984d1d6083..64ca67e246f8 100644 --- a/gcc/testsuite/g++.target/powerpc/pr65242.C +++ b/gcc/testsuite/g++.target/powerpc/pr65242.C @@ -1,4 +1,5 @@ -/* { dg-do compile { target lp64 } } */ +/* { dg-do compile } */ +/* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ /* { dg-options "-mdejagnu-cpu=power8 -O3" } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr67211.C b/gcc/testsuite/g++.target/powerpc/pr67211.C index b58c08234272..946802e44cde 100644 --- a/gcc/testsuite/g++.target/powerpc/pr67211.C +++ b/gcc/testsuite/g++.target/powerpc/pr67211.C @@ -1,4 +1,5 @@ -/* { dg-do compile { target lp64 } } */ +/* { dg-do compile } */ +/* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ /* { dg-options "-mdejagnu-cpu=power7 -mdejagnu-tune=power8 -O3 -w" } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr69667.C b/gcc/testsuite/g++.target/powerpc/pr69667.C index 6a12a3363e98..7527611f334f 100644 --- a/gcc/testsuite/g++.target/powerpc/pr69667.C +++ b/gcc/testsuite/g++.target/powerpc/pr69667.C @@ -1,4 +1,5 @@ -/* { dg-do compile { target lp64 } } */ +/* { dg-do compile } */ +/* Never tested on darwin, so skip there. */ /* { dg-skip-if "" { *-*-darwin* } } */ /* { dg-require-effective-target powerpc_p8vector_ok } */ /* { dg-options "-mdejagnu-cpu=power8 -w -std=c++14" } */ diff --git a/gcc/testsuite/g++.target/powerpc/pr71294.C b/gcc/testsuite/g++.target/powerpc/pr71294.C index 1da1e327a285..50ced56cdf6a 100644 --- a/gcc/testsuite/g++.target/powerpc/pr71294.C +++ b/gcc/testsuite/g++.target/powerpc/pr71294.C @@ -1,4 +1,4 @@ -// { dg-do compile { target lp64 } } +// { dg-do compile } // { dg-require-effective-target powerpc_p8vector_ok } */ // { dg-options "-mdejagnu-cpu=power8 -O3 -fstack-protector" } -- 2.27.0