From a4d4d2f5cf230a0125526aea59016c792d807b94 Mon Sep 17 00:00:00 2001 From: Kyrylo Tkachov Date: Wed, 17 Jan 2018 19:11:15 +0000 Subject: [PATCH] [arm] Fix gcc.target/arm/g2.c and scd42-2.c for --with-mode=thumb hardfloat targets These -mcpu=xscale tests are ARM-only tests and they go to great pains to reject explicit overriding options, but they're missing the -marm in their dg-options, which means they will still give that nasty Thumb1 hard-float error when testing an implicit --with-mode=thumb toolchain (--with-cpu=cortex-a15 --with-fpu=neon-vfpv4 --with-float=hard --with-mode=thumb, for example). This patch adds the missing -marm and all is good again. * gcc.target/arm/g2.c: Add -marm to dg-options. * gcc.target/arm/scd42-2.c: Likewise. From-SVN: r256812 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/arm/g2.c | 2 +- gcc/testsuite/gcc.target/arm/scd42-2.c | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index da2cc0b..a0114d0 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2018-01-17 Kyrylo Tkachov + + * gcc.target/arm/g2.c: Add -marm to dg-options. + * gcc.target/arm/scd42-2.c: Likewise. + 2018-01-17 Nathan Sidwell PR c++/83287 diff --git a/gcc/testsuite/gcc.target/arm/g2.c b/gcc/testsuite/gcc.target/arm/g2.c index 85ba190..e368017 100644 --- a/gcc/testsuite/gcc.target/arm/g2.c +++ b/gcc/testsuite/gcc.target/arm/g2.c @@ -1,6 +1,6 @@ /* Verify that hardware multiply is preferred on XScale. */ /* { dg-do compile } */ -/* { dg-options "-mcpu=xscale -O2" } */ +/* { dg-options "-mcpu=xscale -O2 -marm" } */ /* { dg-skip-if "Test is specific to the Xscale" { arm*-*-* } { "-march=*" } { "-march=xscale" } } */ /* { dg-skip-if "Test is specific to the Xscale" { arm*-*-* } { "-mcpu=*" } { "-mcpu=xscale" } } */ /* { dg-skip-if "Test is specific to ARM mode" { arm*-*-* } { "-mthumb" } { "" } } */ diff --git a/gcc/testsuite/gcc.target/arm/scd42-2.c b/gcc/testsuite/gcc.target/arm/scd42-2.c index 8cd4bde..6d9e5e1 100644 --- a/gcc/testsuite/gcc.target/arm/scd42-2.c +++ b/gcc/testsuite/gcc.target/arm/scd42-2.c @@ -4,7 +4,7 @@ /* { dg-skip-if "Test is specific to the Xscale" { arm*-*-* } { "-mcpu=*" } { "-mcpu=xscale" } } */ /* { dg-skip-if "Test is specific to ARM mode" { arm*-*-* } { "-mthumb" } { "" } } */ /* { dg-require-effective-target arm32 } */ -/* { dg-options "-mcpu=xscale -O" } */ +/* { dg-options "-mcpu=xscale -O -marm" } */ unsigned load2(void) __attribute__ ((naked)); unsigned load2(void) -- 2.7.4