From ec0f936b30ef0065907ce0a45d0fa9053763f3e3 Mon Sep 17 00:00:00 2001 From: David Malcolm Date: Fri, 8 Mar 2019 22:27:08 +0000 Subject: [PATCH] i386.c: make "sorry" message more amenable to translation (PR target/79926) gcc/ChangeLog: PR target/79926 * config/i386/i386.c (ix86_set_current_function): Make "sorry" messages more amenable to translation, and improve wording. gcc/testsuite/ChangeLog: PR target/79926 * gcc.target/i386/interrupt-387-err-1.c: Update expected message. * gcc.target/i386/interrupt-387-err-2.c: Likewise. * gcc.target/i386/interrupt-mmx-err-1.c: Likewise. * gcc.target/i386/interrupt-mmx-err-2.c: Likewise. From-SVN: r269515 --- gcc/ChangeLog | 6 ++++++ gcc/config/i386/i386.c | 13 ++++++++----- gcc/testsuite/ChangeLog | 8 ++++++++ gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c | 4 ++-- gcc/testsuite/gcc.target/i386/interrupt-387-err-2.c | 2 +- gcc/testsuite/gcc.target/i386/interrupt-mmx-err-1.c | 4 ++-- gcc/testsuite/gcc.target/i386/interrupt-mmx-err-2.c | 2 +- 7 files changed, 28 insertions(+), 11 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 15910aa..564ad3e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-03-08 David Malcolm + + PR target/79926 + * config/i386/i386.c (ix86_set_current_function): Make "sorry" + messages more amenable to translation, and improve wording. + 2019-03-08 Bill Schmidt * config/rs6000/rs6000-p8swap.c (rs6000_analyze_swaps): Rebuild diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 319caed..e50938c 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -5999,12 +5999,15 @@ ix86_set_current_function (tree fndecl) if (isa != NULL) { if (cfun->machine->func_type != TYPE_NORMAL) - sorry ("%s instructions aren't allowed in %s service routine", - isa, (cfun->machine->func_type == TYPE_EXCEPTION - ? "exception" : "interrupt")); + sorry (cfun->machine->func_type == TYPE_EXCEPTION + ? G_("%s instructions aren%'t allowed in an" + " exception service routine") + : G_("%s instructions aren%'t allowed in an" + " interrupt service routine"), + isa); else - sorry ("%s instructions aren't allowed in function with " - "no_caller_saved_registers attribute", isa); + sorry ("%s instructions aren%'t allowed in a function with " + "the % attribute", isa); /* Don't issue the same error twice. */ cfun->machine->func_type = TYPE_NORMAL; cfun->machine->no_caller_saved_registers = false; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0b820ac..1605c21 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2019-03-08 David Malcolm + + PR target/79926 + * gcc.target/i386/interrupt-387-err-1.c: Update expected message. + * gcc.target/i386/interrupt-387-err-2.c: Likewise. + * gcc.target/i386/interrupt-mmx-err-1.c: Likewise. + * gcc.target/i386/interrupt-mmx-err-2.c: Likewise. + 2019-03-08 Paolo Carlini PR c++/63540 diff --git a/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c b/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c index 3fbdc88..8561a3c 100644 --- a/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c +++ b/gcc/testsuite/gcc.target/i386/interrupt-387-err-1.c @@ -6,11 +6,11 @@ typedef unsigned int uword_t __attribute__ ((mode (__word__))); void __attribute__((interrupt)) fn1 (void *frame, uword_t error) -{ /* { dg-message "80387 instructions aren't allowed in exception service routine" } */ +{ /* { dg-message "80387 instructions aren't allowed in an exception service routine" } */ } void __attribute__((interrupt)) fn2 (void *frame) -{ /* { dg-message "80387 instructions aren't allowed in interrupt service routine" } */ +{ /* { dg-message "80387 instructions aren't allowed in an interrupt service routine" } */ } diff --git a/gcc/testsuite/gcc.target/i386/interrupt-387-err-2.c b/gcc/testsuite/gcc.target/i386/interrupt-387-err-2.c index 3203d64..9810f18 100644 --- a/gcc/testsuite/gcc.target/i386/interrupt-387-err-2.c +++ b/gcc/testsuite/gcc.target/i386/interrupt-387-err-2.c @@ -4,5 +4,5 @@ void __attribute__((no_caller_saved_registers)) fn1 (void) -{ /* { dg-message "80387 instructions aren't allowed in function with no_caller_saved_registers attribute" } */ +{ /* { dg-message "80387 instructions aren't allowed in a function with the 'no_caller_saved_registers' attribute" } */ } diff --git a/gcc/testsuite/gcc.target/i386/interrupt-mmx-err-1.c b/gcc/testsuite/gcc.target/i386/interrupt-mmx-err-1.c index cd1367b..8c14594 100644 --- a/gcc/testsuite/gcc.target/i386/interrupt-mmx-err-1.c +++ b/gcc/testsuite/gcc.target/i386/interrupt-mmx-err-1.c @@ -6,11 +6,11 @@ typedef unsigned int uword_t __attribute__ ((mode (__word__))); void __attribute__((interrupt)) fn1 (void *frame) -{ /* { dg-message "MMX/3Dnow instructions aren't allowed in interrupt service routine" } */ +{ /* { dg-message "MMX/3Dnow instructions aren't allowed in an interrupt service routine" } */ } void __attribute__((interrupt)) fn2 (void *frame, uword_t error) -{ /* { dg-message "MMX/3Dnow instructions aren't allowed in exception service routine" } */ +{ /* { dg-message "MMX/3Dnow instructions aren't allowed in an exception service routine" } */ } diff --git a/gcc/testsuite/gcc.target/i386/interrupt-mmx-err-2.c b/gcc/testsuite/gcc.target/i386/interrupt-mmx-err-2.c index 3e9f70c..073700e 100644 --- a/gcc/testsuite/gcc.target/i386/interrupt-mmx-err-2.c +++ b/gcc/testsuite/gcc.target/i386/interrupt-mmx-err-2.c @@ -4,5 +4,5 @@ void __attribute__((no_caller_saved_registers)) fn1 (void) -{ /* { dg-message "MMX/3Dnow instructions aren't allowed in function with no_caller_saved_registers attribute" } */ +{ /* { dg-message "MMX/3Dnow instructions aren't allowed in a function with the 'no_caller_saved_registers' attribute" } */ } -- 2.7.4