diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 12cedf9c0f49a4986e6bc3a90976de929eced17b..5cff4875fd8055b7a428f5b884d1ea16e0f80cf6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,8 @@ 2012-10-12 Janis Johnson <janisjo@codesourcery.com> + * gcc.dg/vect/pr48765.c: Skip for conflicting options, don't + specify -m64. + * gcc.target/arm/div64-unwinding.c: Skip, don't xfail, for GNU/Linux. diff --git a/gcc/testsuite/gcc.dg/vect/pr48765.c b/gcc/testsuite/gcc.dg/vect/pr48765.c index 469c4f423ce24f5ae7c920f62820338c62b2778b..50839e389c72a1baceae6702ad515f56fd75735c 100644 --- a/gcc/testsuite/gcc.dg/vect/pr48765.c +++ b/gcc/testsuite/gcc.dg/vect/pr48765.c @@ -1,5 +1,6 @@ -/* { dg-do compile { target powerpc*-*-* } } */ -/* { dg-options "-m64 -O3 -mcpu=power6" } */ +/* { dg-do compile { target { powerpc*-*-* } } } */ +/* { dg-skip-if "do not override -mcpu" { *-*-* } { "-mcpu=*" } { "-mcpu=power6" } } */ +/* { dg-options "-O3 -mcpu=power6" } */ enum reg_class {