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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 780004ab569d83aa78d9b8aaa30a75626234744a..c951ce8429871e77724df4a7c12df1e00fef3038 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-04-09  Jakub Jelinek  <jakub@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.
+
 2019-04-08  wu yuan  <wuyuan5@huawei.com>
 
        * config/aarch64/aarch64-cores.def (tsv1100): Change scheduling model.

diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c
index 9aa0fd2fb71deb1177cbebc2bb9f7f0f843e2521..e7440f3909510882c013f30f4d03e1a11636dd8a 100644 (file)
--- 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 038a431317c967ed53a8cf158b6550672bbc8fe5..a91b447b01eb64a6482eca41e45eaf85291138fd 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2019-04-09  Jakub Jelinek  <jakub@redhat.com>
+
+       PR target/90015
+       * gcc.target/riscv/interrupt-conflict-mode.c (foo): Adjust expected
+       diagnostics.
+
 2019-04-08  Richard Biener  <rguenther@suse.de>
 
        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 6e280ed177118307bdd91882a5df2b544df3212a..e9f145265c09a65689b1f77e118cc44a72d4d428 100644 (file)
--- 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" } */
 }