diff options
author | Martin Liska <mliska@suse.cz> | 2019-04-05 10:37:44 +0200 |
---|---|---|
committer | Martin Liska <marxin@gcc.gnu.org> | 2019-04-05 08:37:44 +0000 |
commit | 904f3daa028eea44c6a591fb1ac746ee81c72be1 (patch) | |
tree | cf8126bdefb6a0be9b1636a06ee491b90f1ab6a0 /gcc/config | |
parent | 8d6b13da61aabc7c55d858ee3fd7ae22798d6a61 (diff) | |
download | gcc-904f3daa028eea44c6a591fb1ac746ee81c72be1.zip gcc-904f3daa028eea44c6a591fb1ac746ee81c72be1.tar.gz gcc-904f3daa028eea44c6a591fb1ac746ee81c72be1.tar.bz2 |
Remove usage of apostrophes in error and warning messages (PR translation/89935).
2019-04-05 Martin Liska <mliska@suse.cz>
PR translation/89935
* check-internal-format-escaping.py: Properly detect wrong
apostrophes.
2019-04-05 Martin Liska <mliska@suse.cz>
PR translation/89935
* collect-utils.c (collect_execute): Use %< and %>, or %qs in
order to wrap keywords or arguments.
* collect2.c (main): Likewise.
(scan_prog_file): Likewise.
(scan_libraries): Likewise.
* common/config/riscv/riscv-common.c (riscv_subset_list::parsing_subset_version): Likewise.
(riscv_subset_list::parse_std_ext): Likewise.
* config/aarch64/aarch64.c (aarch64_override_options_internal): Likewise.
* config/arm/arm.c (arm_option_override): Likewise.
* config/cris/cris.c (cris_print_operand): Likewise.
* config/darwin-c.c (darwin_pragma_options): Likewise.
(darwin_pragma_unused): Likewise.
(darwin_pragma_ms_struct): Likewise.
* config/ft32/ft32.c (ft32_print_operand): Likewise.
* config/i386/i386.c (print_reg): Likewise.
(ix86_print_operand): Likewise.
* config/i386/xm-djgpp.h: Likewise.
* config/iq2000/iq2000.c (iq2000_print_operand): Likewise.
* config/m32c/m32c.c (m32c_option_override): Likewise.
* config/msp430/msp430.c (msp430_option_override): Likewise.
* config/nds32/nds32.c (nds32_option_override): Likewise.
* config/nvptx/mkoffload.c (main): Likewise.
* config/rx/rx.c (rx_print_operand): Likewise.
(valid_psw_flag): Likewise.
* config/vms/vms-c.c (vms_pragma_member_alignment): Likewise.
(vms_pragma_nomember_alignment): Likewise.
(vms_pragma_extern_model): Likewise.
* lto-wrapper.c (compile_offload_image): Likewise.
* omp-offload.c (oacc_parse_default_dims): Likewise.
* symtab.c (symtab_node::verify_base): Likewise.
* tlink.c (recompile_files): Likewise.
(start_tweaking): Likewise.
* tree-profile.c (parse_profile_filter): Likewise.
2019-04-05 Martin Liska <mliska@suse.cz>
PR translation/89935
* objc-act.c (objc_add_property_declaration): Use %< and %>, or %qs in
order to wrap keywords or arguments.
(objc_add_synthesize_declaration_for_property): Likewise.
From-SVN: r270163
Diffstat (limited to 'gcc/config')
-rw-r--r-- | gcc/config/aarch64/aarch64.c | 4 | ||||
-rw-r--r-- | gcc/config/arm/arm.c | 2 | ||||
-rw-r--r-- | gcc/config/cris/cris.c | 2 | ||||
-rw-r--r-- | gcc/config/darwin-c.c | 24 | ||||
-rw-r--r-- | gcc/config/ft32/ft32.c | 2 | ||||
-rw-r--r-- | gcc/config/i386/i386.c | 4 | ||||
-rw-r--r-- | gcc/config/i386/xm-djgpp.h | 4 | ||||
-rw-r--r-- | gcc/config/iq2000/iq2000.c | 2 | ||||
-rw-r--r-- | gcc/config/m32c/m32c.c | 2 | ||||
-rw-r--r-- | gcc/config/msp430/msp430.c | 18 | ||||
-rw-r--r-- | gcc/config/nds32/nds32.c | 6 | ||||
-rw-r--r-- | gcc/config/nvptx/mkoffload.c | 2 | ||||
-rw-r--r-- | gcc/config/rx/rx.c | 7 | ||||
-rw-r--r-- | gcc/config/vms/vms-c.c | 15 |
14 files changed, 48 insertions, 46 deletions
diff --git a/gcc/config/aarch64/aarch64.c b/gcc/config/aarch64/aarch64.c index b38505b..95e5b03 100644 --- a/gcc/config/aarch64/aarch64.c +++ b/gcc/config/aarch64/aarch64.c @@ -11575,8 +11575,8 @@ aarch64_override_options_internal (struct gcc_options *opts) int probe_interval = PARAM_VALUE (PARAM_STACK_CLASH_PROTECTION_PROBE_INTERVAL); if (guard_size != probe_interval) - error ("stack clash guard size '%d' must be equal to probing interval " - "'%d'", guard_size, probe_interval); + error ("stack clash guard size %<%d%> must be equal to probing interval " + "%<%d%>", guard_size, probe_interval); /* Enable sw prefetching at specified optimization level for CPUS that have prefetch. Lower optimization level threshold by 1 diff --git a/gcc/config/arm/arm.c b/gcc/config/arm/arm.c index 67f1a9c..7ce063f 100644 --- a/gcc/config/arm/arm.c +++ b/gcc/config/arm/arm.c @@ -3499,7 +3499,7 @@ arm_option_override (void) || pic_register >= PC_REGNUM || (TARGET_VXWORKS_RTP && (unsigned int) pic_register != arm_pic_register)) - error ("unable to use '%s' for PIC register", arm_pic_register_string); + error ("unable to use %qs for PIC register", arm_pic_register_string); else arm_pic_register = pic_register; } diff --git a/gcc/config/cris/cris.c b/gcc/config/cris/cris.c index 591941b..95bc004 100644 --- a/gcc/config/cris/cris.c +++ b/gcc/config/cris/cris.c @@ -903,7 +903,7 @@ cris_print_operand (FILE *file, rtx x, int code) case ':': /* The PIC register. */ if (! flag_pic) - internal_error ("invalid use of ':' modifier"); + internal_error ("invalid use of %<:%> modifier"); fprintf (file, "$%s", reg_names [PIC_OFFSET_TABLE_REGNUM]); return; diff --git a/gcc/config/darwin-c.c b/gcc/config/darwin-c.c index d74d9a5..8331153 100644 --- a/gcc/config/darwin-c.c +++ b/gcc/config/darwin-c.c @@ -99,17 +99,17 @@ darwin_pragma_options (cpp_reader *pfile ATTRIBUTE_UNUSED) tree t, x; if (pragma_lex (&t) != CPP_NAME) - BAD ("malformed '#pragma options', ignoring"); + BAD ("malformed %<#pragma options%>, ignoring"); arg = IDENTIFIER_POINTER (t); if (strcmp (arg, "align")) - BAD ("malformed '#pragma options', ignoring"); + BAD ("malformed %<#pragma options%>, ignoring"); if (pragma_lex (&t) != CPP_EQ) - BAD ("malformed '#pragma options', ignoring"); + BAD ("malformed %<#pragma options%>, ignoring"); if (pragma_lex (&t) != CPP_NAME) - BAD ("malformed '#pragma options', ignoring"); + BAD ("malformed %<#pragma options%>, ignoring"); if (pragma_lex (&x) != CPP_EOF) - warning (OPT_Wpragmas, "junk at end of '#pragma options'"); + warning (OPT_Wpragmas, "junk at end of %<#pragma options%>"); arg = IDENTIFIER_POINTER (t); if (!strcmp (arg, "mac68k")) @@ -119,7 +119,7 @@ darwin_pragma_options (cpp_reader *pfile ATTRIBUTE_UNUSED) else if (!strcmp (arg, "reset")) pop_field_alignment (); else - BAD ("malformed '#pragma options align={mac68k|power|reset}', ignoring"); + BAD ("malformed %<#pragma options align={mac68k|power|reset}%>, ignoring"); } /* #pragma unused ([var {, var}*]) */ @@ -131,7 +131,7 @@ darwin_pragma_unused (cpp_reader *pfile ATTRIBUTE_UNUSED) int tok; if (pragma_lex (&x) != CPP_OPEN_PAREN) - BAD ("missing '(' after '#pragma unused', ignoring"); + BAD ("missing %<(%> after %<#pragma unused%>, ignoring"); while (1) { @@ -152,10 +152,10 @@ darwin_pragma_unused (cpp_reader *pfile ATTRIBUTE_UNUSED) } if (tok != CPP_CLOSE_PAREN) - BAD ("missing ')' after '#pragma unused', ignoring"); + BAD ("missing %<)%> after %<#pragma unused%>, ignoring"); if (pragma_lex (&x) != CPP_EOF) - BAD ("junk at end of '#pragma unused'"); + BAD ("junk at end of %<#pragma unused%>"); } /* Parse the ms_struct pragma. */ @@ -166,7 +166,7 @@ darwin_pragma_ms_struct (cpp_reader *pfile ATTRIBUTE_UNUSED) tree t; if (pragma_lex (&t) != CPP_NAME) - BAD ("malformed '#pragma ms_struct', ignoring"); + BAD ("malformed %<#pragma ms_struct%>, ignoring"); arg = IDENTIFIER_POINTER (t); if (!strcmp (arg, "on")) @@ -174,10 +174,10 @@ darwin_pragma_ms_struct (cpp_reader *pfile ATTRIBUTE_UNUSED) else if (!strcmp (arg, "off") || !strcmp (arg, "reset")) darwin_ms_struct = false; else - BAD ("malformed '#pragma ms_struct {on|off|reset}', ignoring"); + BAD ("malformed %<#pragma ms_struct {on|off|reset}%>, ignoring"); if (pragma_lex (&t) != CPP_EOF) - BAD ("junk at end of '#pragma ms_struct'"); + BAD ("junk at end of %<#pragma ms_struct%>"); } static struct frameworks_in_use { diff --git a/gcc/config/ft32/ft32.c b/gcc/config/ft32/ft32.c index 0f6817c..64b3172 100644 --- a/gcc/config/ft32/ft32.c +++ b/gcc/config/ft32/ft32.c @@ -178,7 +178,7 @@ ft32_print_operand (FILE * file, rtx x, int code) case 'h': if (GET_CODE (operand) != REG) - internal_error ("'h' applied to non-register operand"); + internal_error ("%<h%> applied to non-register operand"); fprintf (file, "%s", reg_names[REGNO (operand) + 1]); return; diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index a754494..57d5a7b 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -17632,7 +17632,7 @@ print_reg (rtx x, int code, FILE *file) if (GENERAL_REGNO_P (regno)) msize = GET_MODE_SIZE (word_mode); else - error ("'V' modifier on non-integer register"); + error ("%<V%> modifier on non-integer register"); } duplicated = code == 'd' && TARGET_AVX; @@ -17896,7 +17896,7 @@ ix86_print_operand (FILE *file, rtx x, int code) } if (GET_MODE_CLASS (GET_MODE (x)) == MODE_FLOAT) - warning (0, "non-integer operand used with operand code 'z'"); + warning (0, "non-integer operand used with operand code %<z%>"); /* FALLTHRU */ case 'Z': diff --git a/gcc/config/i386/xm-djgpp.h b/gcc/config/i386/xm-djgpp.h index 8ebc825..8cb8bc6 100644 --- a/gcc/config/i386/xm-djgpp.h +++ b/gcc/config/i386/xm-djgpp.h @@ -84,10 +84,10 @@ along with GCC; see the file COPYING3. If not see if (djgpp == NULL) \ fatal_error (UNKNOWN_LOCATION, "environment variable DJGPP not defined"); \ else if (access (djgpp, R_OK) == 0) \ - fatal_error (UNKNOWN_LOCATION, "environment variable DJGPP points to missing file '%s'", \ + fatal_error (UNKNOWN_LOCATION, "environment variable DJGPP points to missing file %qs", \ djgpp); \ else \ - fatal_error (UNKNOWN_LOCATION, "environment variable DJGPP points to corrupt file '%s'", \ + fatal_error (UNKNOWN_LOCATION, "environment variable DJGPP points to corrupt file %qs", \ djgpp); \ } \ } while (0) diff --git a/gcc/config/iq2000/iq2000.c b/gcc/config/iq2000/iq2000.c index 4bdbf11..c3be6fa 100644 --- a/gcc/config/iq2000/iq2000.c +++ b/gcc/config/iq2000/iq2000.c @@ -3099,7 +3099,7 @@ iq2000_print_operand (FILE *file, rtx op, int letter) break; default: - error ("PRINT_OPERAND: Unknown punctuation '%c'", letter); + error ("PRINT_OPERAND: Unknown punctuation %<%c%>", letter); break; } diff --git a/gcc/config/m32c/m32c.c b/gcc/config/m32c/m32c.c index dd66b8a..1a0d0c68 100644 --- a/gcc/config/m32c/m32c.c +++ b/gcc/config/m32c/m32c.c @@ -417,7 +417,7 @@ m32c_option_override (void) if (global_options_set.x_target_memregs) { if (target_memregs < 0 || target_memregs > 16) - error ("invalid target memregs value '%d'", target_memregs); + error ("invalid target memregs value %<%d%>", target_memregs); } else target_memregs = 16; diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c index 48d16a4..020e980 100644 --- a/gcc/config/msp430/msp430.c +++ b/gcc/config/msp430/msp430.c @@ -797,14 +797,14 @@ msp430_option_override (void) if (msp430_warn_mcu) { if (target_cpu&& msp430x != xisa) - warning (0, "MCU '%s' supports %s ISA but %<-mcpu%> option " + warning (0, "MCU %qs supports %s ISA but %<-mcpu%> option " "is set to %s", target_mcu, xisa ? "430X" : "430", msp430x ? "430X" : "430"); if (msp430_mcu_data[i].hwmpy == 0 && msp430_hwmult_type != MSP430_HWMULT_AUTO && msp430_hwmult_type != MSP430_HWMULT_NONE) - warning (0, "MCU '%s' does not have hardware multiply " + warning (0, "MCU %qs does not have hardware multiply " "support, but %<-mhwmult%> is set to %s", target_mcu, msp430_hwmult_type == MSP430_HWMULT_SMALL ? "16-bit" @@ -812,15 +812,15 @@ msp430_option_override (void) else if (msp430_hwmult_type == MSP430_HWMULT_SMALL && msp430_mcu_data[i].hwmpy != 1 && msp430_mcu_data[i].hwmpy != 2 ) - warning (0, "MCU '%s' supports %s hardware multiply, " + warning (0, "MCU %qs supports %s hardware multiply, " "but %<-mhwmult%> is set to 16-bit", target_mcu, hwmult_name (msp430_mcu_data[i].hwmpy)); else if (msp430_hwmult_type == MSP430_HWMULT_LARGE && msp430_mcu_data[i].hwmpy != 4) - warning (0, "MCU '%s' supports %s hardware multiply, " + warning (0, "MCU %qs supports %s hardware multiply, " "but %<-mhwmult%> is set to 32-bit", target_mcu, hwmult_name (msp430_mcu_data[i].hwmpy)); else if (msp430_hwmult_type == MSP430_HWMULT_F5SERIES && msp430_mcu_data[i].hwmpy != 8) - warning (0, "MCU '%s' supports %s hardware multiply, " + warning (0, "MCU %qs supports %s hardware multiply, " "but %<-mhwmult%> is set to f5series", target_mcu, hwmult_name (msp430_mcu_data[i].hwmpy)); } @@ -837,14 +837,14 @@ msp430_option_override (void) { if (target_cpu == NULL) warning (0, - "Unrecognized MCU name '%s', assuming that it is " + "Unrecognized MCU name %qs, assuming that it is " "just a MSP430 with no hardware multiply.\n" "Use the %<-mcpu%> and %<-mhwmult%> options to " "set these explicitly.", target_mcu); else warning (0, - "Unrecognized MCU name '%s', assuming that it " + "Unrecognized MCU name %qs, assuming that it " "has no hardware multiply.\nUse the %<-mhwmult%> " "option to set this explicitly.", target_mcu); @@ -856,7 +856,7 @@ msp430_option_override (void) { if (msp430_warn_mcu) warning (0, - "Unrecognized MCU name '%s', assuming that it just " + "Unrecognized MCU name %qs, assuming that it just " "supports the MSP430 ISA.\nUse the %<-mcpu%> option " "to set the ISA explicitly.", target_mcu); @@ -864,7 +864,7 @@ msp430_option_override (void) msp430x = false; } else if (msp430_warn_mcu) - warning (0, "Unrecognized MCU name '%s'.", target_mcu); + warning (0, "Unrecognized MCU name %qs.", target_mcu); } } diff --git a/gcc/config/nds32/nds32.c b/gcc/config/nds32/nds32.c index f2723ea..fe5c260 100644 --- a/gcc/config/nds32/nds32.c +++ b/gcc/config/nds32/nds32.c @@ -4175,10 +4175,10 @@ nds32_option_override (void) { if (nds32_arch_option == ARCH_V3S || nds32_arch_option == ARCH_V3F) error ("Disable FPU ISA, " - "the ABI option must be enable '-mfloat-abi=soft'"); + "the ABI option must be enable %<-mfloat-abi=soft%>"); else - error ("'-mabi=2fp+' option only support when FPU available, " - "must be enable '-mext-fpu-sp' or '-mext-fpu-dp'"); + error ("%<-mabi=2fp+%> option only support when FPU available, " + "must be enable %<-mext-fpu-sp%> or %<-mext-fpu-dp%>"); } nds32_init_rtx_costs (); diff --git a/gcc/config/nvptx/mkoffload.c b/gcc/config/nvptx/mkoffload.c index 3770f72..e93a129 100644 --- a/gcc/config/nvptx/mkoffload.c +++ b/gcc/config/nvptx/mkoffload.c @@ -454,7 +454,7 @@ main (int argc, char **argv) if (!found) fatal_error (input_location, - "offload compiler %s not found (consider using '-B')", + "offload compiler %s not found (consider using %<-B%>)", GCC_INSTALL_NAME); /* We may be called with all the arguments stored in some file and diff --git a/gcc/config/rx/rx.c b/gcc/config/rx/rx.c index dac05db..f70e8f3 100644 --- a/gcc/config/rx/rx.c +++ b/gcc/config/rx/rx.c @@ -648,8 +648,8 @@ rx_print_operand (FILE * file, rtx op, int letter) case CTRLREG_FINTV: fprintf (file, "fintv"); break; case CTRLREG_INTB: fprintf (file, "intb"); break; default: - warning (0, "unrecognized control register number: %d - using 'psw'", - (int) INTVAL (op)); + warning (0, "unrecognized control register number: %d" + "- using %<psw%>", (int) INTVAL (op)); fprintf (file, "psw"); break; } @@ -2593,7 +2593,8 @@ valid_psw_flag (rtx op, const char *which) return 1; } - error ("%<__builtin_rx_%s%> takes 'C', 'Z', 'S', 'O', 'I', or 'U'", which); + error ("%<__builtin_rx_%s%> takes %<C%>, %<Z%>, %<S%>, %<O%>, %<I%>, " + "or %<U%>", which); if (!mvtc_inform_done) error ("use %<__builtin_rx_mvtc%> (0, ... ) to write arbitrary values to PSW"); mvtc_inform_done = 1; diff --git a/gcc/config/vms/vms-c.c b/gcc/config/vms/vms-c.c index 1e6b9f5..d2bdd04 100644 --- a/gcc/config/vms/vms-c.c +++ b/gcc/config/vms/vms-c.c @@ -77,7 +77,8 @@ vms_pragma_member_alignment (cpp_reader *pfile ATTRIBUTE_UNUSED) } if (tok != CPP_NAME) { - warning (OPT_Wpragmas, "malformed '#pragma member_alignment', ignoring"); + warning (OPT_Wpragmas, + "malformed %<#pragma member_alignment%>, ignoring"); return; } @@ -92,12 +93,12 @@ vms_pragma_member_alignment (cpp_reader *pfile ATTRIBUTE_UNUSED) maximum_field_alignment = saved_member_alignment; else { - error ("unknown '#pragma member_alignment' name %s", arg); + error ("unknown %<#pragma member_alignment%> name %s", arg); return; } if (pragma_lex (&x) != CPP_EOF) { - error ("malformed '#pragma member_alignment'"); + error ("malformed %<#pragma member_alignment%>"); return; } } @@ -131,7 +132,7 @@ vms_pragma_nomember_alignment (cpp_reader *pfile ATTRIBUTE_UNUSED) maximum_field_alignment = 16 * BITS_PER_UNIT; else { - error ("unhandled alignment for '#pragma nomember_alignment'"); + error ("unhandled alignment for %<#pragma nomember_alignment%>"); } tok = pragma_lex (&x); @@ -144,7 +145,7 @@ vms_pragma_nomember_alignment (cpp_reader *pfile ATTRIBUTE_UNUSED) if (tok != CPP_EOF) { - error ("garbage at end of '#pragma nomember_alignment'"); + error ("garbage at end of %<#pragma nomember_alignment%>"); return; } } @@ -199,7 +200,7 @@ vms_pragma_extern_model (cpp_reader *pfile ATTRIBUTE_UNUSED) if (tok != CPP_NAME) { - warning (OPT_Wpragmas, "malformed '#pragma extern_model', ignoring"); + warning (OPT_Wpragmas, "malformed %<#pragma extern_model%>, ignoring"); return; } @@ -225,7 +226,7 @@ vms_pragma_extern_model (cpp_reader *pfile ATTRIBUTE_UNUSED) } else { - error ("unknown '#pragma extern_model' model '%s'", arg); + error ("unknown %<#pragma extern_model%> model %qs", arg); return; } #if 0 |