Hi! The following patch fixes a typo in diagnostics as well as removes trailing dot. Tested by Jim and also preapproved by him in the PR, committed to trunk.
2019-04-09 Jakub Jelinek <ja...@redhat.com> 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. --- gcc/config/riscv/riscv.c.jj 2019-03-27 12:41:41.369556065 +0100 +++ gcc/config/riscv/riscv.c 2019-04-08 21:44:02.053600490 +0200 @@ -4736,7 +4736,7 @@ riscv_function_ok_for_sibcall (tree decl 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 olddec 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), --- gcc/testsuite/gcc.target/riscv/interrupt-conflict-mode.c.jj 2018-07-16 09:42:22.772983004 +0200 +++ gcc/testsuite/gcc.target/riscv/interrupt-conflict-mode.c 2019-04-08 21:45:44.116948950 +0200 @@ -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" } */ } Jakub