From 718afa1acdb7bb247fe69995f3939ed26ab43a42 Mon Sep 17 00:00:00 2001 From: Steve Ellcey Date: Thu, 2 Nov 2017 21:58:05 +0000 Subject: [PATCH] re PR target/79868 (aarch64: diagnostic "malformed target %s value" not translateable) PR target/79868 * gcc.target/aarch64/spellcheck_1.c: Update dg-error string to match new format. * gcc.target/aarch64/spellcheck_2.c: Ditto. * gcc.target/aarch64/spellcheck_3.c: Ditto. * gcc.target/aarch64/target_attr_11.c: Ditto. * gcc.target/aarch64/target_attr_12.c: Ditto. * gcc.target/aarch64/target_attr_17.c: Ditto. From-SVN: r254360 --- gcc/testsuite/ChangeLog | 11 +++++++++++ gcc/testsuite/gcc.target/aarch64/spellcheck_1.c | 4 ++-- gcc/testsuite/gcc.target/aarch64/spellcheck_2.c | 6 +++--- gcc/testsuite/gcc.target/aarch64/spellcheck_3.c | 6 +++--- gcc/testsuite/gcc.target/aarch64/target_attr_11.c | 2 +- gcc/testsuite/gcc.target/aarch64/target_attr_12.c | 2 +- gcc/testsuite/gcc.target/aarch64/target_attr_17.c | 2 +- 7 files changed, 22 insertions(+), 11 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bc4a20752c2..8bf7b55b4dc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2017-11-02 Steve Ellcey + + PR target/79868 + * gcc.target/aarch64/spellcheck_1.c: Update dg-error string to match + new format. + * gcc.target/aarch64/spellcheck_2.c: Ditto. + * gcc.target/aarch64/spellcheck_3.c: Ditto. + * gcc.target/aarch64/target_attr_11.c: Ditto. + * gcc.target/aarch64/target_attr_12.c: Ditto. + * gcc.target/aarch64/target_attr_17.c: Ditto. + 2017-11-02 Nathan Sidwell PR c++/82710 diff --git a/gcc/testsuite/gcc.target/aarch64/spellcheck_1.c b/gcc/testsuite/gcc.target/aarch64/spellcheck_1.c index ccfe417e644..f57e0c54632 100644 --- a/gcc/testsuite/gcc.target/aarch64/spellcheck_1.c +++ b/gcc/testsuite/gcc.target/aarch64/spellcheck_1.c @@ -4,6 +4,6 @@ __attribute__((target ("arch=armv8-a-typo"))) void foo () { /* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'armv8-a'?" "" { target *-*-* } .-1 } */ - /* { dg-error "unknown value 'armv8-a-typo' for 'arch' target attribute" "" { target *-*-* } .-2 } */ - /* { dg-error "target attribute 'arch=armv8-a-typo' is invalid" "" { target *-*-* } .-3 } */ + /* { dg-error "invalid name \\(\"armv8-a-typo\"\\) in 'target\\(\"arch=\"\\)' pragma or attribute" "" { target *-*-* } .-2 } */ + /* { dg-error "pragma or attribute 'target\\(\"arch=armv8-a-typo\"\\)' is not valid" "" { target *-*-* } .-3 } */ } diff --git a/gcc/testsuite/gcc.target/aarch64/spellcheck_2.c b/gcc/testsuite/gcc.target/aarch64/spellcheck_2.c index 42ba51a7226..70096f89e0b 100644 --- a/gcc/testsuite/gcc.target/aarch64/spellcheck_2.c +++ b/gcc/testsuite/gcc.target/aarch64/spellcheck_2.c @@ -3,7 +3,7 @@ __attribute__((target ("cpu=cortex-a57-typo"))) void foo () { - /* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'cortex-a57?" "" { target *-*-* } .-1 } */ - /* { dg-error "unknown value 'cortex-a57-typo' for 'cpu' target attribute" "" { target *-*-* } .-2 } */ - /* { dg-error "target attribute 'cpu=cortex-a57-typo' is invalid" "" { target *-*-* } .-3 } */ + /* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'cortex-a57'?" "" { target *-*-* } .-1 } */ + /* { dg-error "invalid name \\(\"cortex-a57-typo\"\\) in 'target\\(\"cpu=\"\\)' pragma or attribute" "" { target *-*-* } .-2 } */ + /* { dg-error "pragma or attribute 'target\\(\"cpu=cortex-a57-typo\"\\)' is not valid" "" { target *-*-* } .-3 } */ } diff --git a/gcc/testsuite/gcc.target/aarch64/spellcheck_3.c b/gcc/testsuite/gcc.target/aarch64/spellcheck_3.c index 03d2bbf14a0..20dff2b6e45 100644 --- a/gcc/testsuite/gcc.target/aarch64/spellcheck_3.c +++ b/gcc/testsuite/gcc.target/aarch64/spellcheck_3.c @@ -3,7 +3,7 @@ __attribute__((target ("tune=cortex-a57-typo"))) void foo () { - /* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'cortex-a57?" "" { target *-*-* } .-1 } */ - /* { dg-error "unknown value 'cortex-a57-typo' for 'tune' target attribute" "" { target *-*-* } .-2 } */ - /* { dg-error "target attribute 'tune=cortex-a57-typo' is invalid" "" { target *-*-* } .-3 } */ + /* { dg-message "valid arguments are: \[^\n\r]*; did you mean 'cortex-a57'?" "" { target *-*-* } .-1 } */ + /* { dg-error "invalid name \\(\"cortex-a57-typo\"\\) in 'target\\(\"tune=\"\\)' pragma or attribute" "" { target *-*-* } .-2 } */ + /* { dg-error "pragma or attribute 'target\\(\"tune=cortex-a57-typo\"\\)' is not valid" "" { target *-*-* } .-3 } */ } diff --git a/gcc/testsuite/gcc.target/aarch64/target_attr_11.c b/gcc/testsuite/gcc.target/aarch64/target_attr_11.c index 7cfb826fc44..a3df438206b 100644 --- a/gcc/testsuite/gcc.target/aarch64/target_attr_11.c +++ b/gcc/testsuite/gcc.target/aarch64/target_attr_11.c @@ -10,4 +10,4 @@ foo (int a) } /* { dg-error "does not allow a negated form" "" { target *-*-* } 0 } */ -/* { dg-error "is invalid" "" { target *-*-* } 0 } */ +/* { dg-error "is not valid" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.target/aarch64/target_attr_12.c b/gcc/testsuite/gcc.target/aarch64/target_attr_12.c index 39cb9964003..8a3a25bfed7 100644 --- a/gcc/testsuite/gcc.target/aarch64/target_attr_12.c +++ b/gcc/testsuite/gcc.target/aarch64/target_attr_12.c @@ -10,4 +10,4 @@ foo (int a) } /* { dg-error "does not accept an argument" "" { target *-*-* } 0 } */ -/* { dg-error "is invalid" "" { target *-*-* } 0 } */ +/* { dg-error "is not valid" "" { target *-*-* } 0 } */ diff --git a/gcc/testsuite/gcc.target/aarch64/target_attr_17.c b/gcc/testsuite/gcc.target/aarch64/target_attr_17.c index 483cc6d4a1d..2a7a7511bea 100644 --- a/gcc/testsuite/gcc.target/aarch64/target_attr_17.c +++ b/gcc/testsuite/gcc.target/aarch64/target_attr_17.c @@ -5,4 +5,4 @@ foo (int a) return a + 5; } -/* { dg-error "target attribute.*is invalid" "" { target *-*-* } 0 } */ \ No newline at end of file +/* { dg-error "attribute 'target\\(\"invalid-attr-string\"\\)' is not valid" "" { target *-*-* } 0 } */ -- 2.30.2