On 01/16/2013 05:31 AM, Nick Clifton wrote:
> Hi Janis,
>
>> Back in September I submitted a patch to fix five ARM tests in
>> <http://gcc.gnu.org/ml/gcc-patches/2012-09/msg01515.html>.
>> You responded in < http://gcc.gnu.org/ml/gcc-patches/2012-10/msg00972.html>
>> and I answered your questions in a reply.
>
> I believe that Richard's main point was that the skips that you were
> adding to the tests meant that they would not be run for valid
> command line options.
Now I get it. This version is more selective about which multilibs
are skipped. I tested it by using multilib test flags for all valid
values for -march, with and without -mthumb as appropriate for the
arch. The ones that are now skipped are the ones that used to fail
with complaints from the compiler.
Is this OK?
Janis
2013-01-16 Janis Johnson <jani...@codesourcery.com>
* gcc.target/arm/pr40887.c: Require at least armv5.
* gcc.target/arm/pr51835.c: Avoid conflicts with multilib flags.
* gcc.target/arm/pr51915.c: Likewise.
* gcc.target/arm/pr52006.c: Likewise.
* gcc.target/arm/pr53187.c: Likewise.
Index: src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr40887.c
===================================================================
--- src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr40887.c (revision
195216)
+++ src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr40887.c (working copy)
@@ -1,3 +1,4 @@
+/* { dg-skip-if "need at least armv5" { *-*-* } { "-march=armv[234]*" } { "" }
} */
/* { dg-options "-O2 -march=armv5te" } */
/* { dg-final { scan-assembler "blx" } } */
Index: src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr51835.c
===================================================================
--- src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr51835.c (revision
195216)
+++ src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr51835.c (working copy)
@@ -1,6 +1,8 @@
/* { dg-do compile } */
-/* { dg-options "-O2 -mfloat-abi=hard -mfpu=fpv4-sp-d16" } */
-/* { dg-require-effective-target arm_thumb2_ok } */
+/* { dg-skip-if "no support for hard-float VFP ABI" { arm_thumb1 } {
"-march=*" } { "" } } */
+/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" } {
"-mfloat-abi=hard" } } */
+/* { dg-skip-if "avoid conflicting -mfpu" { *-*-* } { "-mfpu=*" } {
"-mfpu=fpv4-sp-d16" "-mfpu=vfpv3xd" "-mfpu=vfpv3xd-fp16" } } */
+/* { dg-options "-O2 -march=armv7-a -mfloat-abi=hard -mfpu=fpv4-sp-d16" } */
int func1 (double d)
{
Index: src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr51915.c
===================================================================
--- src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr51915.c (revision
195216)
+++ src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr51915.c (working copy)
@@ -1,5 +1,7 @@
/* PR target/51915 */
/* { dg-do compile } */
+/* { dg-skip-if "no support for hard-float VFP ABI" { arm_thumb1 } {
"-march=*" } { "" } } */
+/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" } {
"-mfloat-abi=hard" } } */
/* { dg-options "-march=armv7-a -mfloat-abi=hard -O2" } */
struct S { int s1; void *s2; };
Index: src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr52006.c
===================================================================
--- src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr52006.c (revision
195216)
+++ src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr52006.c (working copy)
@@ -1,5 +1,7 @@
/* PR target/52006 */
/* { dg-do compile } */
+/* { dg-skip-if "avoid conflicts with multilib flags" { *-*-* } {
"-mfloat-abi=*" } { "-mfloat-abi=hard" } } */
+/* { dg-skip-if "no support for hard-float VFP ABI" { arm_thumb1 } {
"-march=*" } { "" } } */
/* { dg-options "-march=armv7-a -mfloat-abi=hard -O2 -fPIC" } */
unsigned long a;
Index: src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr53187.c
===================================================================
--- src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr53187.c (revision
195216)
+++ src/gcc-mainline/gcc/testsuite/gcc.target/arm/pr53187.c (working copy)
@@ -1,5 +1,7 @@
/* PR target/53187 */
/* { dg-do compile } */
+/* { dg-skip-if "no support for hard-float VFP ABI" { arm_thumb1 } {
"-march=*" } { "" } } */
+/* { dg-skip-if "do not override -mfloat-abi" { *-*-* } { "-mfloat-abi=*" } {
"-mfloat-abi=hard" } } */
/* { dg-options "-march=armv7-a -mfloat-abi=hard -O2" } */
void bar (int);
