From 7326cf0fb08b1977171aa97bc8370d950129c813 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme Date: Fri, 17 Nov 2017 10:01:33 +0000 Subject: [PATCH] [ARM] Rework expectation for call to Armv8-M nonsecure function Testcase gcc.target/arm/cmse/cmse-14.c checks whether bar is called via __gnu_cmse_nonsecure_call libcall and not via a direct call. However the pattern is a bit surprising in that it needs to explicitely allow "by" due to allowing anything before the 'b'. This patch rewrites the logic to look for b as a first non-whitespace letter followed iby anything (to match bl and conditional branches) followed by some spaces and then bar. 2017-11-17 Thomas Preud'homme gcc/testsuite/ * gcc.target/arm/cmse/cmse-14.c: Change logic to match branch instruction to bar. From-SVN: r254861 --- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/gcc.target/arm/cmse/cmse-14.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a2592119797..652ddc876b6 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-11-17 Thomas Preud'homme + + * gcc.target/arm/cmse/cmse-14.c: Change logic to match branch + instruction to bar. + 2017-11-17 Thomas Preud'homme * gcc.target/arm/cmse/cmse.exp: Add option to select Armv8-M Baseline diff --git a/gcc/testsuite/gcc.target/arm/cmse/cmse-14.c b/gcc/testsuite/gcc.target/arm/cmse/cmse-14.c index 701e9ee7e31..df1ea52bec5 100644 --- a/gcc/testsuite/gcc.target/arm/cmse/cmse-14.c +++ b/gcc/testsuite/gcc.target/arm/cmse/cmse-14.c @@ -10,4 +10,4 @@ int foo (void) } /* { dg-final { scan-assembler "bl\t__gnu_cmse_nonsecure_call" } } */ -/* { dg-final { scan-assembler-not "b\[^ y\n\]*\\s+bar" } } */ +/* { dg-final { scan-assembler-not "^(.*\\s)?bl?\[^\\s]*\\s+bar" } } */ -- 2.30.2