On 07/07/11 00:28, Janis Johnson wrote:
> This patch removes -march= from nine tests that also check for relevant
> effective targets. If -march is removed there is no need to ignore
> compiler warnings about conflicting options with dg-prune-output, so the
> patch removes that from the tests.
>
> OK for trunk, and for 4.6 in a few days?
>
>
> gcc-20110706-4
>
>
> 2011-07-06 Janis Johnson <jani...@codesourcery.com>
>
> * gcc.target/arm/pr39839.c: Remove -march option and unneeded
> dg-prune-output.
> * gcc.target/arm/pr40657-2.c: Likewise.
> * gcc.target/arm/pr40956.c: Likewise.
> * gcc.target/arm/pr42235.c: Likewise.
> * gcc.target/arm/pr42495.c: Likewise.
> * gcc.target/arm/pr42505.c: Likewise.
> * gcc.target/arm/pr42574.c: Likewise.
> * gcc.target/arm/pr46934.c: Likewise.
> * gcc.target/arm/thumb-branch1.c: Likewise.
>
> Index: gcc.target/arm/pr39839.c
> ===================================================================
> --- gcc.target/arm/pr39839.c (revision 175921)
> +++ gcc.target/arm/pr39839.c (working copy)
> @@ -1,6 +1,5 @@
> -/* { dg-options "-mthumb -Os -march=armv5te -mthumb-interwork -fpic" } */
> +/* { dg-options "-mthumb -Os -mthumb-interwork -fpic" } */
> /* { dg-require-effective-target arm_thumb1_ok } */
> -/* { dg-prune-output "switch .* conflicts with" } */
> /* { dg-final { scan-assembler-not "str\[\\t \]*r.,\[\\t \]*.sp," } } */
>
I think this test should work in both ARM and Thumb mode and for any
Thumb variant. So I'd be inclined to remove arm_thumb1_ok and change
the dg-options to "-Os -fpic".
> Index: gcc.target/arm/pr40657-2.c
OK.
> Index: gcc.target/arm/pr40956.c
> ===================================================================
> --- gcc.target/arm/pr40956.c (revision 175921)
> +++ gcc.target/arm/pr40956.c (working copy)
> @@ -1,7 +1,6 @@
> -/* { dg-options "-mthumb -Os -fpic -march=armv5te" } */
> +/* { dg-options "-mthumb -Os -fpic" } */
> /* { dg-require-effective-target arm_thumb1_ok } */
> /* { dg-require-effective-target fpic } */
> -/* { dg-prune-output "switch .* conflicts with" } */
> /* Make sure the constant "0" is loaded into register only once. */
> /* { dg-final { scan-assembler-times "mov\[\\t \]*r., #0" 1 } } */
>
Same comment as for pr39839.c
> Index: gcc.target/arm/pr42235.c
OK.
> Index: gcc.target/arm/pr42495.c
OK.
> Index: gcc.target/arm/pr42505.c
> ===================================================================
> --- gcc.target/arm/pr42505.c (revision 175921)
> +++ gcc.target/arm/pr42505.c (working copy)
> @@ -1,6 +1,5 @@
> -/* { dg-options "-mthumb -Os -march=armv5te" } */
> +/* { dg-options "-mthumb -Os" } */
> /* { dg-require-effective-target arm_thumb1_ok } */
> -/* { dg-prune-output "switch .* conflicts with" } */
> /* { dg-final { scan-assembler-not "str\[\\t \]*r.,\[\\t \]*.sp," } } */
>
Same comment as for pr39839.c
> Index: gcc.target/arm/pr42574.c
OK
> Index: gcc.target/arm/pr46934.c
There's nothing cpu specific here, this should be in gcc.c-torture/compile.
> Index: gcc.target/arm/thumb-branch1.c
OK.
