From 31215daa9b8099963fc1fb04abd13f6321f02a74 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Tue, 9 Apr 2019 08:38:07 +0200 Subject: [PATCH] re PR target/90015 (riscv: typo "intterupt" in diagnostic) PR target/90015 * config/riscv/riscv.c (riscv_get_interrupt_type): Fix comment typo. (riscv_merge_decl_attributes): Fix typo in diagnostics. Remove trailing period from it too. * gcc.target/riscv/interrupt-conflict-mode.c (foo): Adjust expected diagnostics. From-SVN: r270221 --- gcc/ChangeLog | 7 +++++++ gcc/config/riscv/riscv.c | 4 ++-- gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gcc.target/riscv/interrupt-conflict-mode.c | 2 +- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 780004ab569..c951ce84298 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2019-04-09 Jakub Jelinek + + PR target/90015 + * config/riscv/riscv.c (riscv_get_interrupt_type): Fix comment typo. + (riscv_merge_decl_attributes): Fix typo in diagnostics. Remove + trailing period from it too. + 2019-04-08 wu yuan * config/aarch64/aarch64-cores.def (tsv1100): Change scheduling model. diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c index 9aa0fd2fb71..e7440f39095 100644 --- a/gcc/config/riscv/riscv.c +++ b/gcc/config/riscv/riscv.c @@ -4736,7 +4736,7 @@ riscv_function_ok_for_sibcall (tree decl ATTRIBUTE_UNUSED, return true; } -/* Get the intterupt type, return UNKNOWN_MODE if it's not +/* Get the interrupt type, return UNKNOWN_MODE if it's not interrupt function. */ static enum riscv_privilege_levels riscv_get_interrupt_type (tree decl) @@ -4822,7 +4822,7 @@ riscv_merge_decl_attributes (tree olddecl, tree newdecl) if ((old_interrupt_type != UNKNOWN_MODE) && (new_interrupt_type != UNKNOWN_MODE) && (old_interrupt_type != new_interrupt_type)) - error ("%qs function cannot have different intterupt type.", "interrupt"); + error ("%qs function cannot have different interrupt type", "interrupt"); /* Create combined attributes. */ combined_attrs = merge_attributes (DECL_ATTRIBUTES (olddecl), diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 038a431317c..a91b447b01e 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-04-09 Jakub Jelinek + + PR target/90015 + * gcc.target/riscv/interrupt-conflict-mode.c (foo): Adjust expected + diagnostics. + 2019-04-08 Richard Biener PR tree-optimization/90006 diff --git a/gcc/testsuite/gcc.target/riscv/interrupt-conflict-mode.c b/gcc/testsuite/gcc.target/riscv/interrupt-conflict-mode.c index 6e280ed1771..e9f145265c0 100644 --- a/gcc/testsuite/gcc.target/riscv/interrupt-conflict-mode.c +++ b/gcc/testsuite/gcc.target/riscv/interrupt-conflict-mode.c @@ -6,5 +6,5 @@ foo(void); void __attribute__ ((interrupt ("machine"))) foo (void) -{ /* { dg-error "function cannot have different intterupt type." } */ +{ /* { dg-error "function cannot have different interrupt type" } */ } -- 2.30.2