Szabolcs Nagy <szabolcs.n...@arm.com> writes: > Update tests for the new branch-protection parser errors. > > gcc/testsuite/ChangeLog: > > * gcc.target/aarch64/branch-protection-attr.c: Update. > * gcc.target/aarch64/branch-protection-option.c: Update.
OK, thanks. (And I agree these are better messages. :)) I think that's the last of the AArch64-specific ones. The others will need to be reviewed by Kyrill or Richard. Richard > --- > gcc/testsuite/gcc.target/aarch64/branch-protection-attr.c | 6 +++--- > gcc/testsuite/gcc.target/aarch64/branch-protection-option.c | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/gcc/testsuite/gcc.target/aarch64/branch-protection-attr.c > b/gcc/testsuite/gcc.target/aarch64/branch-protection-attr.c > index 272000c2747..dae2a758a56 100644 > --- a/gcc/testsuite/gcc.target/aarch64/branch-protection-attr.c > +++ b/gcc/testsuite/gcc.target/aarch64/branch-protection-attr.c > @@ -4,19 +4,19 @@ void __attribute__ ((target("branch-protection=leaf"))) > foo1 () > { > } > -/* { dg-error {invalid protection type 'leaf' in > 'target\("branch-protection="\)' pragma or attribute} "" { target *-*-* } 5 } > */ > +/* { dg-error {invalid argument 'leaf' for 'target\("branch-protection="\)'} > "" { target *-*-* } 5 } */ > /* { dg-error {pragma or attribute 'target\("branch-protection=leaf"\)' is > not valid} "" { target *-*-* } 5 } */ > > void __attribute__ ((target("branch-protection=none+pac-ret"))) > foo2 () > { > } > -/* { dg-error "unexpected 'pac-ret' after 'none'" "" { target *-*-* } 12 } */ > +/* { dg-error {argument 'none' can only appear alone in > 'target\("branch-protection="\)'} "" { target *-*-* } 12 } */ > /* { dg-error {pragma or attribute > 'target\("branch-protection=none\+pac-ret"\)' is not valid} "" { target *-*-* > } 12 } */ > > void __attribute__ ((target("branch-protection="))) > foo3 () > { > } > -/* { dg-error {missing argument to 'target\("branch-protection="\)' pragma > or attribute} "" { target *-*-* } 19 } */ > +/* { dg-error {invalid argument '' for 'target\("branch-protection="\)'} "" > { target *-*-* } 19 } */ > /* { dg-error {pragma or attribute 'target\("branch-protection="\)' is not > valid} "" { target *-*-* } 19 } */ > diff --git a/gcc/testsuite/gcc.target/aarch64/branch-protection-option.c > b/gcc/testsuite/gcc.target/aarch64/branch-protection-option.c > index 1b3bf4ee2b8..e2f847a31c4 100644 > --- a/gcc/testsuite/gcc.target/aarch64/branch-protection-option.c > +++ b/gcc/testsuite/gcc.target/aarch64/branch-protection-option.c > @@ -1,4 +1,4 @@ > /* { dg-do "compile" } */ > /* { dg-options "-mbranch-protection=leaf -mbranch-protection=none+pac-ret" > } */ > > -/* { dg-error "unexpected 'pac-ret' after 'none'" "" { target *-*-* } 0 } */ > +/* { dg-error "argument 'none' can only appear alone in > '-mbranch-protection='" "" { target *-*-* } 0 } */