aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2019-04-09 08:38:07 +0200
committerJakub Jelinek <jakub@gcc.gnu.org>2019-04-09 08:38:07 +0200
commit31215daa9b8099963fc1fb04abd13f6321f02a74 (patch)
tree5487905d1604b87fb398083819a014267df70a82 /gcc
parent3fa176b767e14e1d2491775978afac3e87892d1d (diff)
downloadgcc-31215daa9b8099963fc1fb04abd13f6321f02a74.zip
gcc-31215daa9b8099963fc1fb04abd13f6321f02a74.tar.gz
gcc-31215daa9b8099963fc1fb04abd13f6321f02a74.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/config/riscv/riscv.c4
-rw-r--r--gcc/testsuite/ChangeLog6
-rw-r--r--gcc/testsuite/gcc.target/riscv/interrupt-conflict-mode.c2
4 files changed, 16 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 780004a..c951ce8 100644
--- 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 9aa0fd2..e7440f3 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 038a431..a91b447 100644
--- 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 6e280ed..e9f1452 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" } */
}