From bd2c62704bb7e012a3e780dec1288678f51bcd6c Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 9 Jan 2017 22:48:33 +0100 Subject: [PATCH] re PR translation/79019 (translatable string typo in cif-code.def:141) PR translation/79019 PR translation/79020 * params.def (PARAM_INLINE_MIN_SPEEDUP, PARAM_IPA_CP_SINGLE_CALL_PENALTY, PARAM_USE_AFTER_SCOPE_DIRECT_EMISSION_THRESHOLD): Fix typos in descriptions. * config/avr/avr.opt (maccumulate-args): Likewise. * config/msp430/msp430.opt (mwarn-mcu): Likewise. * common.opt (freport-bug): Likewise. * cif-code.def (CIF_FINAL_ERROR): Likewise. * doc/invoke.texi (ipa-cp-single-call-penalty): Likewise. * config/s390/s390.c (s390_invalid_binary_op): Fix spelling in translatable string. * config/i386/i386.c (function_value_32): Likewise. * config/nios2/nios2.c (nios2_valid_target_attribute_rec): Likewise. * config/msp430/msp430.c (msp430_option_override, msp430_attr): Likewise. * config/msp430/driver-msp430.c (msp430_select_hwmult_lib): Likewise. * common/config/msp430/msp430-common.c (msp430_handle_option): Likewise. * symtab.c (symtab_node::verify_base): Likewise. * opts.c (set_debug_level): Likewise. * tree.c (verify_type_variant): Likewise. Fix typo in comment. * config/rs6000/rs6000-c.c (altivec_resolve_overloaded_builtin): Add missing whitespace to translatable strings. * config/avr/avr.md (bswapsi2): Fix typo in comment. * config/sh/superh.h: Likewise. * config/i386/xopintrin.h: Likewise. * config/i386/znver1.md: Likewise. * config/rs6000/rs6000.c (struct rs6000_opt_mask): Likewise. * ipa-inline-analysis.c (compute_inline_parameters): Likewise. * double-int.h (struct double_int): Likewise. * double-int.c (div_and_round_double): Likewise. * wide-int.cc: Likewise. * tree-ssa.c (non_rewritable_mem_ref_base): Likewise. * tree-ssa-sccvn.c (vn_reference_lookup_3): Likewise. * cfgcleanup.c (crossjumps_occured): Renamed to ... (crossjumps_occurred): ... this. (try_crossjump_bb, try_head_merge_bb, try_optimize_cfg, cleanup_cfg): Adjust all uses. cp/ * semantics.c (finish_omp_clauses): Add missing whitespace to translatable strings. * cp-cilkplus.c (cpp_validate_cilk_plus_loop_aux): Fix comment typo. lto/ * lto-symtab.c (lto_symtab_merge_symbols): Fix comment typo. fortran/ * decl.c (attr_decl1): Fix spelling in translatable string. * intrinsic.texi: Fix spelling - invokation -> invocation. * lang.opt (faggressive-function-elimination, gfc_convert): Fix typos in descriptions. * openmp.c (resolve_omp_clauses): Add missing whitespace to translatable strings. c-family/ * c.opt (Wnormalized=): Fix typo in description. testsuite/ * c-c++-common/goacc/host_data-2.c (f): Adjust expected spelling of diagnostics. * gfortran.dg/initialization_17.f90: Likewise. From-SVN: r244245 --- gcc/ChangeLog | 41 ++++++++++++++++ gcc/c-family/ChangeLog | 6 +++ gcc/c-family/c.opt | 2 +- gcc/cfgcleanup.c | 10 ++-- gcc/cif-code.def | 2 +- gcc/common.opt | 2 +- gcc/common/config/msp430/msp430-common.c | 2 +- gcc/config/avr/avr.md | 2 +- gcc/config/avr/avr.opt | 2 +- gcc/config/i386/i386.c | 2 +- gcc/config/i386/xopintrin.h | 2 +- gcc/config/i386/znver1.md | 2 +- gcc/config/msp430/driver-msp430.c | 2 +- gcc/config/msp430/msp430.c | 18 ++++--- gcc/config/msp430/msp430.opt | 2 +- gcc/config/nios2/nios2.c | 2 +- gcc/config/rs6000/rs6000-c.c | 2 +- gcc/config/rs6000/rs6000.c | 2 +- gcc/config/s390/s390.c | 2 +- gcc/config/sh/superh.h | 2 +- gcc/cp/ChangeLog | 8 ++++ gcc/cp/cp-cilkplus.c | 2 +- gcc/cp/semantics.c | 8 ++-- gcc/doc/invoke.texi | 2 +- gcc/double-int.c | 2 +- gcc/double-int.h | 2 +- gcc/fortran/ChangeLog | 11 +++++ gcc/fortran/decl.c | 2 +- gcc/fortran/intrinsic.texi | 48 +++++++++---------- gcc/fortran/lang.opt | 4 +- gcc/fortran/openmp.c | 6 +-- gcc/ipa-inline-analysis.c | 2 +- gcc/lto/ChangeLog | 6 +++ gcc/lto/lto-symtab.c | 2 +- gcc/opts.c | 2 +- gcc/params.def | 6 +-- gcc/symtab.c | 2 +- gcc/testsuite/ChangeLog | 8 ++++ .../c-c++-common/goacc/host_data-2.c | 4 +- .../gfortran.dg/initialization_17.f90 | 2 +- gcc/tree-ssa-sccvn.c | 2 +- gcc/tree-ssa.c | 2 +- gcc/tree.c | 4 +- gcc/wide-int.cc | 2 +- 44 files changed, 166 insertions(+), 80 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 443a4731b5c..76cb51b55a4 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,46 @@ 2017-01-09 Jakub Jelinek + PR translation/79019 + PR translation/79020 + * params.def (PARAM_INLINE_MIN_SPEEDUP, + PARAM_IPA_CP_SINGLE_CALL_PENALTY, + PARAM_USE_AFTER_SCOPE_DIRECT_EMISSION_THRESHOLD): Fix typos + in descriptions. + * config/avr/avr.opt (maccumulate-args): Likewise. + * config/msp430/msp430.opt (mwarn-mcu): Likewise. + * common.opt (freport-bug): Likewise. + * cif-code.def (CIF_FINAL_ERROR): Likewise. + * doc/invoke.texi (ipa-cp-single-call-penalty): Likewise. + * config/s390/s390.c (s390_invalid_binary_op): Fix spelling in + translatable string. + * config/i386/i386.c (function_value_32): Likewise. + * config/nios2/nios2.c (nios2_valid_target_attribute_rec): Likewise. + * config/msp430/msp430.c (msp430_option_override, msp430_attr): + Likewise. + * config/msp430/driver-msp430.c (msp430_select_hwmult_lib): Likewise. + * common/config/msp430/msp430-common.c (msp430_handle_option): + Likewise. + * symtab.c (symtab_node::verify_base): Likewise. + * opts.c (set_debug_level): Likewise. + * tree.c (verify_type_variant): Likewise. Fix typo in comment. + * config/rs6000/rs6000-c.c (altivec_resolve_overloaded_builtin): Add + missing whitespace to translatable strings. + * config/avr/avr.md (bswapsi2): Fix typo in comment. + * config/sh/superh.h: Likewise. + * config/i386/xopintrin.h: Likewise. + * config/i386/znver1.md: Likewise. + * config/rs6000/rs6000.c (struct rs6000_opt_mask): Likewise. + * ipa-inline-analysis.c (compute_inline_parameters): Likewise. + * double-int.h (struct double_int): Likewise. + * double-int.c (div_and_round_double): Likewise. + * wide-int.cc: Likewise. + * tree-ssa.c (non_rewritable_mem_ref_base): Likewise. + * tree-ssa-sccvn.c (vn_reference_lookup_3): Likewise. + * cfgcleanup.c (crossjumps_occured): Renamed to ... + (crossjumps_occurred): ... this. + (try_crossjump_bb, try_head_merge_bb, try_optimize_cfg, cleanup_cfg): + Adjust all uses. + PR tree-optimization/78899 * tree-if-conv.c (version_loop_for_if_conversion): Instead of returning bool return struct loop *, NULL for failure and the new diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 3bd2c7ce88e..968d4839834 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2017-01-09 Jakub Jelinek + + PR translation/79019 + PR translation/79020 + * c.opt (Wnormalized=): Fix typo in description. + 2017-01-08 Martin Sebor PR middle-end/77708 diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt index 8b2fc79f8ab..104d8160c36 100644 --- a/gcc/c-family/c.opt +++ b/gcc/c-family/c.opt @@ -802,7 +802,7 @@ C ObjC C++ ObjC++ Warning Alias(Wnormalized=,nfc,none) Wnormalized= C ObjC C++ ObjC++ RejectNegative Joined Warning CPP(warn_normalize) CppReason(CPP_W_NORMALIZE) Init(normalized_C) Var(cpp_warn_normalize) Enum(cpp_normalize_level) --Wnormalized= Warn about non-normalised Unicode strings. +-Wnormalized= Warn about non-normalized Unicode strings. ; Required for these enum values. SourceInclude diff --git a/gcc/cfgcleanup.c b/gcc/cfgcleanup.c index 522c9c2bebe..9663b68fb32 100644 --- a/gcc/cfgcleanup.c +++ b/gcc/cfgcleanup.c @@ -60,7 +60,7 @@ along with GCC; see the file COPYING3. If not see static bool first_pass; /* Set to true if crossjumps occurred in the latest run of try_optimize_cfg. */ -static bool crossjumps_occured; +static bool crossjumps_occurred; /* Set to true if we couldn't run an optimization due to stale liveness information; we should run df_analyze to enable more opportunities. */ @@ -2283,7 +2283,7 @@ try_crossjump_bb (int mode, basic_block bb) } if (changed) - crossjumps_occured = true; + crossjumps_occurred = true; return changed; } @@ -2584,7 +2584,7 @@ try_head_merge_bb (basic_block bb) free (headptr); free (nextptr); - crossjumps_occured |= changed; + crossjumps_occurred |= changed; return changed; } @@ -2650,7 +2650,7 @@ try_optimize_cfg (int mode) if (mode & (CLEANUP_CROSSJUMP | CLEANUP_THREADING)) clear_bb_flags (); - crossjumps_occured = false; + crossjumps_occurred = false; FOR_EACH_BB_FN (bb, cfun) update_forwarder_flag (bb); @@ -3169,7 +3169,7 @@ cleanup_cfg (int mode) if ((mode & CLEANUP_EXPENSIVE) && !reload_completed && !delete_trivially_dead_insns (get_insns (), max_reg_num ())) break; - if ((mode & CLEANUP_CROSSJUMP) && crossjumps_occured) + if ((mode & CLEANUP_CROSSJUMP) && crossjumps_occurred) run_fast_dce (); } else diff --git a/gcc/cif-code.def b/gcc/cif-code.def index de84de5828b..a2f05e016f2 100644 --- a/gcc/cif-code.def +++ b/gcc/cif-code.def @@ -138,4 +138,4 @@ DEFCIFCODE(UNREACHABLE, CIF_FINAL_ERROR, /* We can't inline because of instrumentation thunk. */ DEFCIFCODE(CHKP, CIF_FINAL_ERROR, - N_("caller is instrumetnation thunk")) + N_("caller is instrumentation thunk")) diff --git a/gcc/common.opt b/gcc/common.opt index 4b35e4b61be..8ad5b77fe06 100644 --- a/gcc/common.opt +++ b/gcc/common.opt @@ -1262,7 +1262,7 @@ Suppress output of addresses in debugging dumps. freport-bug Common Driver Var(flag_report_bug) Collect and dump debug information into temporary file if ICE in C/C++ -compiler occured. +compiler occurred. fdump-internal-locations Common Var(flag_dump_locations) Init(0) diff --git a/gcc/common/config/msp430/msp430-common.c b/gcc/common/config/msp430/msp430-common.c index b3f78efd345..7834314f122 100644 --- a/gcc/common/config/msp430/msp430-common.c +++ b/gcc/common/config/msp430/msp430-common.c @@ -54,7 +54,7 @@ msp430_handle_option (struct gcc_options *opts ATTRIBUTE_UNUSED, } else { - error ("unrecognised argument of -mcpu: %s", decoded->arg); + error ("unrecognized argument of -mcpu: %s", decoded->arg); return false; } break; diff --git a/gcc/config/avr/avr.md b/gcc/config/avr/avr.md index 4d8e39163b4..256b2b66b71 100644 --- a/gcc/config/avr/avr.md +++ b/gcc/config/avr/avr.md @@ -6284,7 +6284,7 @@ [(set_attr "length" "2") (set_attr "cc" "none")]) -;; Swap Bytes (change byte-endianess) +;; Swap Bytes (change byte-endianness) (define_expand "bswapsi2" [(set (reg:SI 22) diff --git a/gcc/config/avr/avr.opt b/gcc/config/avr/avr.opt index 915187249c1..a1edec97785 100644 --- a/gcc/config/avr/avr.opt +++ b/gcc/config/avr/avr.opt @@ -76,7 +76,7 @@ Make the linker relaxation machine assume that a program counter wrap-around occ maccumulate-args Target Report Mask(ACCUMULATE_OUTGOING_ARGS) -Accumulate outgoing function arguments and acquire/release the needed stack space for outpoing function arguments in function prologue/epilogue. Without this option, outgoing arguments are pushed before calling a function and popped afterwards. This option can lead to reduced code size for functions that call many functions that get their arguments on the stack like, for example printf. +Accumulate outgoing function arguments and acquire/release the needed stack space for outgoing function arguments in function prologue/epilogue. Without this option, outgoing arguments are pushed before calling a function and popped afterwards. This option can lead to reduced code size for functions that call many functions that get their arguments on the stack like, for example printf. mstrict-X Target Report Var(avr_strict_X) Init(0) diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 3ad021a607f..b173b894dee 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -10390,7 +10390,7 @@ function_value_32 (machine_mode orig_mode, machine_mode mode, int sse_level = ix86_function_sseregparm (fntype, fn, false); if (sse_level == -1) { - error ("calling %qD with SSE caling convention without " + error ("calling %qD with SSE calling convention without " "SSE/SSE2 enabled", fn); sorry ("this is a GCC bug that can be worked around by adding " "attribute used to function called"); diff --git a/gcc/config/i386/xopintrin.h b/gcc/config/i386/xopintrin.h index 447799cdff9..3a83e249322 100644 --- a/gcc/config/i386/xopintrin.h +++ b/gcc/config/i386/xopintrin.h @@ -36,7 +36,7 @@ #define __DISABLE_XOP__ #endif /* __XOP__ */ -/* Integer multiply/add intructions. */ +/* Integer multiply/add instructions. */ extern __inline __m128i __attribute__((__gnu_inline__, __always_inline__, __artificial__)) _mm_maccs_epi16(__m128i __A, __m128i __B, __m128i __C) { diff --git a/gcc/config/i386/znver1.md b/gcc/config/i386/znver1.md index 990a70d82aa..8ea6d09407f 100644 --- a/gcc/config/i386/znver1.md +++ b/gcc/config/i386/znver1.md @@ -120,7 +120,7 @@ (eq_attr "type" "leave")) "znver1-double,znver1-ieu, znver1-store") -;; Integer Instructions or General intructions +;; Integer Instructions or General instructions ;; Multiplications ;; Reg operands (define_insn_reservation "znver1_imul" 3 diff --git a/gcc/config/msp430/driver-msp430.c b/gcc/config/msp430/driver-msp430.c index 9ae3f5745c5..37ce669981b 100644 --- a/gcc/config/msp430/driver-msp430.c +++ b/gcc/config/msp430/driver-msp430.c @@ -684,7 +684,7 @@ msp430_select_hwmult_lib (int argc ATTRIBUTE_UNUSED, const char ** argv ATTRIBUT case 4: return "-lmul_32"; case 8: return "-lmul_f5"; default: - error ("unrecognised hwpy field in msp430_mcu_data[%d]: %d", + error ("unrecognized hwpy field in msp430_mcu_data[%d]: %d", i, msp430_mcu_data[i].hwmpy); break; } diff --git a/gcc/config/msp430/msp430.c b/gcc/config/msp430/msp430.c index d2a9e6b16a1..fa2dbc20bce 100644 --- a/gcc/config/msp430/msp430.c +++ b/gcc/config/msp430/msp430.c @@ -809,11 +809,16 @@ msp430_option_override (void) { if (target_cpu == NULL) warning (0, - "Unrecognised MCU name '%s', assuming that it is just a MSP430 with no hardware multiply.\nUse the -mcpu and -mhwmult options to set these explicitly.", + "Unrecognized MCU name '%s', 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, - "Unrecognised MCU name '%s', assuming that it has no hardware multiply.\nUse the -mhwmult option to set this explicitly.", + "Unrecognized MCU name '%s', assuming that it " + "has no hardware multiply.\nUse the -mhwmult " + "option to set this explicitly.", target_mcu); } @@ -823,14 +828,15 @@ msp430_option_override (void) { if (msp430_warn_mcu) warning (0, - "Unrecognised MCU name '%s', assuming that it just supports the MSP430 ISA.\nUse the -mcpu option to set the ISA explicitly.", + "Unrecognized MCU name '%s', assuming that it just " + "supports the MSP430 ISA.\nUse the -mcpu option to " + "set the ISA explicitly.", target_mcu); msp430x = false; } else if (msp430_warn_mcu) - warning (0, - "Unrecognised MCU name '%s'.", target_mcu); + warning (0, "Unrecognized MCU name '%s'.", target_mcu); } } @@ -1851,7 +1857,7 @@ msp430_attr (tree * node, /* Allow the attribute to be added - the linker script being used may still recognise this name. */ warning (OPT_Wattributes, - "unrecognised interrupt vector argument of %qE attribute", + "unrecognized interrupt vector argument of %qE attribute", name); break; diff --git a/gcc/config/msp430/msp430.opt b/gcc/config/msp430/msp430.opt index bc42723659d..c027201bacd 100644 --- a/gcc/config/msp430/msp430.opt +++ b/gcc/config/msp430/msp430.opt @@ -12,7 +12,7 @@ Specify the MCU to build for. mwarn-mcu Target Report Var(msp430_warn_mcu) Init(1) -Warn if an MCU name is unrecognised or conflicts with other options (default: on). +Warn if an MCU name is unrecognized or conflicts with other options (default: on). mcpu= Target Report Joined RejectNegative Var(target_cpu) diff --git a/gcc/config/nios2/nios2.c b/gcc/config/nios2/nios2.c index c28471f8071..e1b0372f4a9 100644 --- a/gcc/config/nios2/nios2.c +++ b/gcc/config/nios2/nios2.c @@ -3818,7 +3818,7 @@ nios2_valid_target_attribute_rec (tree args) } else { - error ("% is not recognised as FPU instruction", + error ("% is not recognized as FPU instruction", argstr + 7); return false; } diff --git a/gcc/config/rs6000/rs6000-c.c b/gcc/config/rs6000/rs6000-c.c index 0ab25ec5b75..b928547ca16 100644 --- a/gcc/config/rs6000/rs6000-c.c +++ b/gcc/config/rs6000/rs6000-c.c @@ -6000,7 +6000,7 @@ altivec_resolve_overloaded_builtin (location_t loc, tree fndecl, { if (TYPE_READONLY (TREE_TYPE (type)) && !TYPE_READONLY (TREE_TYPE (decl_type))) - warning (0, "passing arg %d of %qE discards qualifiers from" + warning (0, "passing arg %d of %qE discards qualifiers from " "pointer target type", n + 1, fndecl); type = build_pointer_type (build_qualified_type (TREE_TYPE (type), 0)); diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index fe858738d38..02b521c8f51 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -38525,7 +38525,7 @@ rs6000_asan_shadow_offset (void) /* Mask options that we want to support inside of attribute((target)) and #pragma GCC target operations. Note, we do not include things like - 64/32-bit, endianess, hard/soft floating point, etc. that would have + 64/32-bit, endianness, hard/soft floating point, etc. that would have different calling sequences. */ struct rs6000_opt_mask { diff --git a/gcc/config/s390/s390.c b/gcc/config/s390/s390.c index 9bd98eb4f91..bfb28650790 100644 --- a/gcc/config/s390/s390.c +++ b/gcc/config/s390/s390.c @@ -15371,7 +15371,7 @@ s390_invalid_binary_op (int op ATTRIBUTE_UNUSED, const_tree type1, const_tree ty operators. */ if (!bool1_p && !bool2_p && TYPE_UNSIGNED (type1) != TYPE_UNSIGNED (type2)) - return N_("types differ in signess"); + return N_("types differ in signedness"); plusminus_p = (op == PLUS_EXPR || op == MINUS_EXPR); muldiv_p = (op == MULT_EXPR || op == RDIV_EXPR || op == TRUNC_DIV_EXPR diff --git a/gcc/config/sh/superh.h b/gcc/config/sh/superh.h index 3fbd4f07e9a..4f7ed3a4bc0 100644 --- a/gcc/config/sh/superh.h +++ b/gcc/config/sh/superh.h @@ -20,7 +20,7 @@ along with GCC; see the file COPYING3. If not see /* This header file is used when the vendor name is set to 'superh'. config.gcc already configured the compiler for SH4 only and switched - the default endianess to little (although big endian is still available). + the default endianness to little (although big endian is still available). This file configures the spec file to the default board configuration but in such a way that it can be overridden by a boardspecs file (using the -specs= option). This file is expected to disable the diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index aa1fd0c03c8..78bcd3f1519 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2017-01-09 Jakub Jelinek + + PR translation/79019 + PR translation/79020 + * semantics.c (finish_omp_clauses): Add missing whitespace to + translatable strings. + * cp-cilkplus.c (cpp_validate_cilk_plus_loop_aux): Fix comment typo. + 2017-01-07 Jason Merrill PR c++/78948 - instantiation from discarded statement diff --git a/gcc/cp/cp-cilkplus.c b/gcc/cp/cp-cilkplus.c index ce326b60587..d147e7eac13 100644 --- a/gcc/cp/cp-cilkplus.c +++ b/gcc/cp/cp-cilkplus.c @@ -137,7 +137,7 @@ cilk_cp_detect_spawn_and_unwrap (tree *exp0) This function is passed in as a function pointer to walk_tree. *TP is the current tree pointer, *WALK_SUBTREES is set to 0 by this function if recursing into TP's subtrees is unnecessary. *DATA is a bool variable that - is set to false if an error has occured. */ + is set to false if an error has occurred. */ static tree cpp_validate_cilk_plus_loop_aux (tree *tp, int *walk_subtrees, void *data) diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index 2ab0723d0ce..342b671814c 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -6221,7 +6221,7 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort) && t != integer_minus_one_node) { warning_at (OMP_CLAUSE_LOCATION (c), 0, - "% static value must be" + "% static value must be " "positive"); t = integer_one_node; } @@ -6288,12 +6288,12 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort) break; case OMP_CLAUSE_VECTOR: warning_at (OMP_CLAUSE_LOCATION (c), 0, - "% length value must be" + "% length value must be " "positive"); break; case OMP_CLAUSE_WORKER: warning_at (OMP_CLAUSE_LOCATION (c), 0, - "% num value must be" + "% num value must be " "positive"); break; default: @@ -7048,7 +7048,7 @@ finish_omp_clauses (tree clauses, enum c_omp_region_type ort) && TREE_CODE (TREE_TYPE (type)) != ARRAY_TYPE))) { error_at (OMP_CLAUSE_LOCATION (c), - "%qs variable is neither a pointer, nor an array" + "%qs variable is neither a pointer, nor an array " "nor reference to pointer or array", omp_clause_code_name[OMP_CLAUSE_CODE (c)]); remove = true; diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 899616199e1..9092e9c0e00 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -10324,7 +10324,7 @@ Percentage penalty the recursive functions will receive when they are evaluated for cloning. @item ipa-cp-single-call-penalty -Percentage penalty functions containg a single call to another +Percentage penalty functions containing a single call to another function will receive when they are evaluated for cloning. diff --git a/gcc/double-int.c b/gcc/double-int.c index e4022aba564..c787b4b7b76 100644 --- a/gcc/double-int.c +++ b/gcc/double-int.c @@ -614,7 +614,7 @@ div_and_round_double (unsigned code, int uns, /* Construct from a buffer of length LEN. BUFFER will be read according - to byte endianess and word endianess. Only the lower LEN bytes + to byte endianness and word endianness. Only the lower LEN bytes of the result are set; the remaining high bytes are cleared. */ double_int diff --git a/gcc/double-int.h b/gcc/double-int.h index e02ffeb8151..2c70bb59694 100644 --- a/gcc/double-int.h +++ b/gcc/double-int.h @@ -60,7 +60,7 @@ struct double_int static double_int from_pair (HOST_WIDE_INT high, unsigned HOST_WIDE_INT low); /* Construct from a fuffer of length LEN. BUFFER will be read according - to byte endianess and word endianess. */ + to byte endianness and word endianness. */ static double_int from_buffer (const unsigned char *buffer, int len); /* No copy assignment operator or destructor to keep the type a POD. */ diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 36e45555c5a..831b96847d1 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,14 @@ +2017-01-09 Jakub Jelinek + + PR translation/79019 + PR translation/79020 + * decl.c (attr_decl1): Fix spelling in translatable string. + * intrinsic.texi: Fix spelling - invokation -> invocation. + * lang.opt (faggressive-function-elimination, gfc_convert): Fix + typos in descriptions. + * openmp.c (resolve_omp_clauses): Add missing whitespace to + translatable strings. + 2017-01-08 Martin Sebor PR tree-optimization/78913 diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 22fc4444ae1..41acc94a0f4 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -7127,7 +7127,7 @@ attr_decl1 (void) if (current_attr.dimension && sym->value) { gfc_error ("Dimensions specified for %s at %L after its " - "initialisation", sym->name, &var_locus); + "initialization", sym->name, &var_locus); m = MATCH_ERROR; goto cleanup; } diff --git a/gcc/fortran/intrinsic.texi b/gcc/fortran/intrinsic.texi index dbf03c6277b..c1de29eaaa6 100644 --- a/gcc/fortran/intrinsic.texi +++ b/gcc/fortran/intrinsic.texi @@ -1850,8 +1850,8 @@ Inverse function: @ref{TANH} @table @asis @item @emph{Description}: @code{ATOMIC_ADD(ATOM, VALUE)} atomically adds the value of @var{VAR} to the -variable @var{ATOM}. When @var{STAT} is present and the invokation was -successful, it is assigned the value 0. If it is present and the invokation +variable @var{ATOM}. When @var{STAT} is present and the invocation was +successful, it is assigned the value 0. If it is present and the invocation has failed, it is assigned a positive value; in particular, for a coindexed @var{ATOM}, if the remote image has stopped, it is assigned the value of @code{ISO_FORTRAN_ENV}'s @code{STAT_STOPPED_IMAGE} and if the remote image has @@ -1901,8 +1901,8 @@ end program atomic @item @emph{Description}: @code{ATOMIC_AND(ATOM, VALUE)} atomically defines @var{ATOM} with the bitwise AND between the values of @var{ATOM} and @var{VALUE}. When @var{STAT} is present -and the invokation was successful, it is assigned the value 0. If it is present -and the invokation has failed, it is assigned a positive value; in particular, +and the invocation was successful, it is assigned the value 0. If it is present +and the invocation has failed, it is assigned a positive value; in particular, for a coindexed @var{ATOM}, if the remote image has stopped, it is assigned the value of @code{ISO_FORTRAN_ENV}'s @code{STAT_STOPPED_IMAGE} and if the remote image has failed, the value @code{STAT_FAILED_IMAGE}. @@ -1951,8 +1951,8 @@ end program atomic @code{ATOMIC_CAS} compares the variable @var{ATOM} with the value of @var{COMPARE}; if the value is the same, @var{ATOM} is set to the value of @var{NEW}. Additionally, @var{OLD} is set to the value of @var{ATOM} -that was used for the comparison. When @var{STAT} is present and the invokation -was successful, it is assigned the value 0. If it is present and the invokation +that was used for the comparison. When @var{STAT} is present and the invocation +was successful, it is assigned the value 0. If it is present and the invocation has failed, it is assigned a positive value; in particular, for a coindexed @var{ATOM}, if the remote image has stopped, it is assigned the value of @code{ISO_FORTRAN_ENV}'s @code{STAT_STOPPED_IMAGE} and if the remote image has @@ -2003,8 +2003,8 @@ end program atomic @table @asis @item @emph{Description}: @code{ATOMIC_DEFINE(ATOM, VALUE)} defines the variable @var{ATOM} with the value -@var{VALUE} atomically. When @var{STAT} is present and the invokation was -successful, it is assigned the value 0. If it is present and the invokation +@var{VALUE} atomically. When @var{STAT} is present and the invocation was +successful, it is assigned the value 0. If it is present and the invocation has failed, it is assigned a positive value; in particular, for a coindexed @var{ATOM}, if the remote image has stopped, it is assigned the value of @code{ISO_FORTRAN_ENV}'s @code{STAT_STOPPED_IMAGE} and if the remote image has @@ -2055,8 +2055,8 @@ end program atomic @item @emph{Description}: @code{ATOMIC_FETCH_ADD(ATOM, VALUE, OLD)} atomically stores the value of @var{ATOM} in @var{OLD} and adds the value of @var{VAR} to the -variable @var{ATOM}. When @var{STAT} is present and the invokation was -successful, it is assigned the value 0. If it is present and the invokation +variable @var{ATOM}. When @var{STAT} is present and the invocation was +successful, it is assigned the value 0. If it is present and the invocation has failed, it is assigned a positive value; in particular, for a coindexed @var{ATOM}, if the remote image has stopped, it is assigned the value of @code{ISO_FORTRAN_ENV}'s @code{STAT_STOPPED_IMAGE} and if the remote image has @@ -2108,8 +2108,8 @@ end program atomic @item @emph{Description}: @code{ATOMIC_AND(ATOM, VALUE)} atomically stores the value of @var{ATOM} in @var{OLD} and defines @var{ATOM} with the bitwise AND between the values of -@var{ATOM} and @var{VALUE}. When @var{STAT} is present and the invokation was -successful, it is assigned the value 0. If it is present and the invokation has +@var{ATOM} and @var{VALUE}. When @var{STAT} is present and the invocation was +successful, it is assigned the value 0. If it is present and the invocation has failed, it is assigned a positive value; in particular, for a coindexed @var{ATOM}, if the remote image has stopped, it is assigned the value of @code{ISO_FORTRAN_ENV}'s @code{STAT_STOPPED_IMAGE} and if the remote image has @@ -2159,8 +2159,8 @@ end program atomic @item @emph{Description}: @code{ATOMIC_OR(ATOM, VALUE)} atomically stores the value of @var{ATOM} in @var{OLD} and defines @var{ATOM} with the bitwise OR between the values of -@var{ATOM} and @var{VALUE}. When @var{STAT} is present and the invokation was -successful, it is assigned the value 0. If it is present and the invokation has +@var{ATOM} and @var{VALUE}. When @var{STAT} is present and the invocation was +successful, it is assigned the value 0. If it is present and the invocation has failed, it is assigned a positive value; in particular, for a coindexed @var{ATOM}, if the remote image has stopped, it is assigned the value of @code{ISO_FORTRAN_ENV}'s @code{STAT_STOPPED_IMAGE} and if the remote image has @@ -2210,8 +2210,8 @@ end program atomic @item @emph{Description}: @code{ATOMIC_XOR(ATOM, VALUE)} atomically stores the value of @var{ATOM} in @var{OLD} and defines @var{ATOM} with the bitwise XOR between the values of -@var{ATOM} and @var{VALUE}. When @var{STAT} is present and the invokation was -successful, it is assigned the value 0. If it is present and the invokation has +@var{ATOM} and @var{VALUE}. When @var{STAT} is present and the invocation was +successful, it is assigned the value 0. If it is present and the invocation has failed, it is assigned a positive value; in particular, for a coindexed @var{ATOM}, if the remote image has stopped, it is assigned the value of @code{ISO_FORTRAN_ENV}'s @code{STAT_STOPPED_IMAGE} and if the remote image has @@ -2261,8 +2261,8 @@ end program atomic @item @emph{Description}: @code{ATOMIC_OR(ATOM, VALUE)} atomically defines @var{ATOM} with the bitwise AND between the values of @var{ATOM} and @var{VALUE}. When @var{STAT} is present -and the invokation was successful, it is assigned the value 0. If it is present -and the invokation has failed, it is assigned a positive value; in particular, +and the invocation was successful, it is assigned the value 0. If it is present +and the invocation has failed, it is assigned a positive value; in particular, for a coindexed @var{ATOM}, if the remote image has stopped, it is assigned the value of @code{ISO_FORTRAN_ENV}'s @code{STAT_STOPPED_IMAGE} and if the remote image has failed, the value @code{STAT_FAILED_IMAGE}. @@ -2310,8 +2310,8 @@ end program atomic @item @emph{Description}: @code{ATOMIC_DEFINE(ATOM, VALUE)} atomically assigns the value of the variable @var{ATOM} to @var{VALUE}. When @var{STAT} is present and the -invokation was successful, it is assigned the value 0. If it is present and the -invokation has failed, it is assigned a positive value; in particular, for a +invocation was successful, it is assigned the value 0. If it is present and the +invocation has failed, it is assigned a positive value; in particular, for a coindexed @var{ATOM}, if the remote image has stopped, it is assigned the value of @code{ISO_FORTRAN_ENV}'s @code{STAT_STOPPED_IMAGE} and if the remote image has failed, the value @code{STAT_FAILED_IMAGE}. @@ -2367,8 +2367,8 @@ end program atomic @item @emph{Description}: @code{ATOMIC_AND(ATOM, VALUE)} atomically defines @var{ATOM} with the bitwise XOR between the values of @var{ATOM} and @var{VALUE}. When @var{STAT} is present -and the invokation was successful, it is assigned the value 0. If it is present -and the invokation has failed, it is assigned a positive value; in particular, +and the invocation was successful, it is assigned the value 0. If it is present +and the invocation has failed, it is assigned a positive value; in particular, for a coindexed @var{ATOM}, if the remote image has stopped, it is assigned the value of @code{ISO_FORTRAN_ENV}'s @code{STAT_STOPPED_IMAGE} and if the remote image has failed, the value @code{STAT_FAILED_IMAGE}. @@ -5535,8 +5535,8 @@ end program test_etime @item @emph{Description}: @code{EVENT_QUERY} assignes the number of events to @var{COUNT} which have been posted to the @var{EVENT} variable and not yet been removed by calling -@code{EVENT WAIT}. When @var{STAT} is present and the invokation was successful, -it is assigned the value 0. If it is present and the invokation has failed, +@code{EVENT WAIT}. When @var{STAT} is present and the invocation was successful, +it is assigned the value 0. If it is present and the invocation has failed, it is assigned a positive value and @var{COUNT} is assigned the value @math{-1}. @item @emph{Standard}: diff --git a/gcc/fortran/lang.opt b/gcc/fortran/lang.opt index 8f5883d628b..9670bf76007 100644 --- a/gcc/fortran/lang.opt +++ b/gcc/fortran/lang.opt @@ -359,7 +359,7 @@ Fortran Joined faggressive-function-elimination Fortran Var(flag_aggressive_function_elimination) -Eliminate multiple function invokations also for impure functions. +Eliminate multiple function invocations also for impure functions. falign-commons Fortran Var(flag_align_commons) Init(1) @@ -398,7 +398,7 @@ Fortran RejectNegative Joined Enum(gfc_convert) Var(flag_convert) Init(GFC_FLAG_ -fconvert= The endianness used for unformatted files. Enum -Name(gfc_convert) Type(enum gfc_convert) UnknownError(Unrecognized option to endianess value: %qs) +Name(gfc_convert) Type(enum gfc_convert) UnknownError(Unrecognized option to endianness value: %qs) EnumValue Enum(gfc_convert) String(big-endian) Value(GFC_FLAG_CONVERT_BIG) diff --git a/gcc/fortran/openmp.c b/gcc/fortran/openmp.c index 4c5a1843fe5..16b75fda3af 100644 --- a/gcc/fortran/openmp.c +++ b/gcc/fortran/openmp.c @@ -3967,7 +3967,7 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses, &expr->where); else if (if_without_mod) { - gfc_error ("IF clause without modifier at %L used together with" + gfc_error ("IF clause without modifier at %L used together with " "IF clauses with modifiers", &omp_clauses->if_expr->where); if_without_mod = false; @@ -4316,7 +4316,7 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses, if (!gfc_resolve_expr (n->expr) || n->expr->ts.type != BT_INTEGER || n->expr->rank != 0) - gfc_error ("SINK addend not a constant integer" + gfc_error ("SINK addend not a constant integer " "at %L", &n->where); } continue; @@ -4627,7 +4627,7 @@ resolve_omp_clauses (gfc_code *code, gfc_omp_clauses *omp_clauses, linear_op = n->u.linear_op; } else if (omp_clauses->orderedc) - gfc_error ("LINEAR clause specified together with" + gfc_error ("LINEAR clause specified together with " "ORDERED clause with argument at %L", &n->where); else if (n->u.linear_op != OMP_LINEAR_REF diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c index 6b648943500..76ea850bda5 100644 --- a/gcc/ipa-inline-analysis.c +++ b/gcc/ipa-inline-analysis.c @@ -2967,7 +2967,7 @@ compute_inline_parameters (struct cgraph_node *node, bool early) inline_update_overall_summary (node); info->self_size = info->size; info->self_time = info->time; - /* We can not inline instrumetnation clones. */ + /* We can not inline instrumentation clones. */ if (node->thunk.add_pointer_bounds_args) { info->inlinable = false; diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index d099374cae6..f94add55852 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,3 +1,9 @@ +2017-01-09 Jakub Jelinek + + PR translation/79019 + PR translation/79020 + * lto-symtab.c (lto_symtab_merge_symbols): Fix comment typo. + 2017-01-06 Nathan Sidwell * lto-partition.c (promote_symbol): Write to dump file sooner, diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c index 88c20dccf44..f61b1f80133 100644 --- a/gcc/lto/lto-symtab.c +++ b/gcc/lto/lto-symtab.c @@ -968,7 +968,7 @@ lto_symtab_merge_symbols (void) /* The user defined assembler variables are also not unified by their symbol name (since it is irrelevant), but we need to unify symbol - nodes if tree merging occured. */ + nodes if tree merging occurred. */ if ((vnode = dyn_cast (node)) && DECL_HARD_REGISTER (vnode->decl) && (node2 = symtab_node::get (vnode->decl)) diff --git a/gcc/opts.c b/gcc/opts.c index 059a61a3e11..c5a14e41e4d 100644 --- a/gcc/opts.c +++ b/gcc/opts.c @@ -2449,7 +2449,7 @@ set_debug_level (enum debug_info_type type, int extended, const char *arg, { int argval = integral_argument (arg); if (argval == -1) - error_at (loc, "unrecognised debug output level %qs", arg); + error_at (loc, "unrecognized debug output level %qs", arg); else if (argval > 3) error_at (loc, "debug output level %qs is too high", arg); else diff --git a/gcc/params.def b/gcc/params.def index 38e91d629ac..6c6cde24f04 100644 --- a/gcc/params.def +++ b/gcc/params.def @@ -51,7 +51,7 @@ DEFPARAM (PARAM_PREDICTABLE_BRANCH_OUTCOME, DEFPARAM (PARAM_INLINE_MIN_SPEEDUP, "inline-min-speedup", - "The minimal estimated speedup allowing inliner to ignore inline-insns-single and inline-isnsns-auto.", + "The minimal estimated speedup allowing inliner to ignore inline-insns-single and inline-insns-auto.", 10, 0, 0) /* The single function inlining limit. This is the maximum size @@ -1007,7 +1007,7 @@ DEFPARAM (PARAM_IPA_CP_RECURSION_PENALTY, DEFPARAM (PARAM_IPA_CP_SINGLE_CALL_PENALTY, "ipa-cp-single-call-penalty", - "Percentage penalty functions containg a single call to another " + "Percentage penalty functions containing a single call to another " "function will receive when they are evaluated for cloning..", 15, 0, 100) @@ -1170,7 +1170,7 @@ DEFPARAM (PARAM_ASAN_INSTRUMENTATION_WITH_CALL_THRESHOLD, DEFPARAM (PARAM_USE_AFTER_SCOPE_DIRECT_EMISSION_THRESHOLD, "use-after-scope-direct-emission-threshold", - "Use direct poisoning/unpoisoning intructions for variables " + "Use direct poisoning/unpoisoning instructions for variables " "smaller or equal to this number.", 256, 0, INT_MAX) diff --git a/gcc/symtab.c b/gcc/symtab.c index d06ab72793e..87120970d34 100644 --- a/gcc/symtab.c +++ b/gcc/symtab.c @@ -1029,7 +1029,7 @@ symtab_node::verify_base (void) } if (analyzed && !definition) { - error ("node is analyzed byt it is not a definition"); + error ("node is analyzed but it is not a definition"); error_found = true; } if (cpp_implicit_alias && !alias) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index b23cb569ce4..60f5c28aa82 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,11 @@ +2017-01-09 Jakub Jelinek + + PR translation/79019 + PR translation/79020 + * c-c++-common/goacc/host_data-2.c (f): Adjust expected spelling of + diagnostics. + * gfortran.dg/initialization_17.f90: Likewise. + 2017-01-09 Dominique d'Humieres PR testsuite/79026 diff --git a/gcc/testsuite/c-c++-common/goacc/host_data-2.c b/gcc/testsuite/c-c++-common/goacc/host_data-2.c index bdce42472b9..6337465d06c 100644 --- a/gcc/testsuite/c-c++-common/goacc/host_data-2.c +++ b/gcc/testsuite/c-c++-common/goacc/host_data-2.c @@ -14,12 +14,12 @@ f (void) #pragma acc host_data use_device(v2) ; /* { dg-error ".use_device_ptr. variable is neither a pointer nor an array" "" { target c } 14 } */ - /* { dg-error ".use_device_ptr. variable is neither a pointer, nor an arraynor reference to pointer or array" "" { target c++ } 14 } */ + /* { dg-error ".use_device_ptr. variable is neither a pointer, nor an array nor reference to pointer or array" "" { target c++ } 14 } */ #pragma acc host_data use_device(v0) ; /* { dg-error ".use_device_ptr. variable is neither a pointer nor an array" "" { target c } 19 } */ - /* { dg-error ".use_device_ptr. variable is neither a pointer, nor an arraynor reference to pointer or array" "" { target c++ } 19 } */ + /* { dg-error ".use_device_ptr. variable is neither a pointer, nor an array nor reference to pointer or array" "" { target c++ } 19 } */ } diff --git a/gcc/testsuite/gfortran.dg/initialization_17.f90 b/gcc/testsuite/gfortran.dg/initialization_17.f90 index c7b73b583df..774869f955d 100644 --- a/gcc/testsuite/gfortran.dg/initialization_17.f90 +++ b/gcc/testsuite/gfortran.dg/initialization_17.f90 @@ -6,5 +6,5 @@ ! integer :: n = 5, m = 7 parameter (n = 42) ! { dg-error "Initializing already initialized variable" } -dimension :: m(3) ! { dg-error "after its initialisation" } +dimension :: m(3) ! { dg-error "after its initialization" } end diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c index b2616e6a94a..97e17bbcfbf 100644 --- a/gcc/tree-ssa-sccvn.c +++ b/gcc/tree-ssa-sccvn.c @@ -2024,7 +2024,7 @@ vn_reference_lookup_3 (ao_ref *ref, tree vuse, void *vr_, /* ??? We can't handle bitfield precision extracts without either using an alternate type for the BIT_FIELD_REF and then doing a conversion or possibly adjusting the offset - according to endianess. */ + according to endianness. */ && (! INTEGRAL_TYPE_P (vr->type) || ref->size == TYPE_PRECISION (vr->type)) && ref->size % BITS_PER_UNIT == 0) diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c index 2d94b239294..605ee0f64bc 100644 --- a/gcc/tree-ssa.c +++ b/gcc/tree-ssa.c @@ -1411,7 +1411,7 @@ non_rewritable_mem_ref_base (tree ref) /* ??? We can't handle bitfield precision extracts without either using an alternate type for the BIT_FIELD_REF and then doing a conversion or possibly adjusting the offset - according to endianess. */ + according to endianness. */ && (! INTEGRAL_TYPE_P (TREE_TYPE (base)) || (wi::to_offset (TYPE_SIZE (TREE_TYPE (base))) == TYPE_PRECISION (TREE_TYPE (base)))) diff --git a/gcc/tree.c b/gcc/tree.c index 7c030fa85a4..f222d3f2d02 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -13320,7 +13320,7 @@ verify_type_variant (const_tree t, tree tv) - aggregates may have new TYPE_FIELDS list that list variants of the main variant TYPE_FIELDS. - vector types may differ by TYPE_VECTOR_OPAQUE - - TYPE_METHODS is always NULL for vairant types and maintained for + - TYPE_METHODS is always NULL for variant types and maintained for main variant only. */ @@ -13523,7 +13523,7 @@ verify_type_variant (const_tree t, tree tv) if (type_with_alias_set_p (t) && !gimple_canonical_types_compatible_p (t, tv, false)) { - error ("type is not compatible with its vairant"); + error ("type is not compatible with its variant"); debug_tree (tv); error ("type variant's TREE_TYPE"); debug_tree (TREE_TYPE (tv)); diff --git a/gcc/wide-int.cc b/gcc/wide-int.cc index 4c1a79a6f8c..dab4c194f23 100644 --- a/gcc/wide-int.cc +++ b/gcc/wide-int.cc @@ -151,7 +151,7 @@ wi::from_array (HOST_WIDE_INT *val, const HOST_WIDE_INT *xval, } /* Construct a wide int from a buffer of length LEN. BUFFER will be - read according to byte endianess and word endianess of the target. + read according to byte endianness and word endianness of the target. Only the lower BUFFER_LEN bytes of the result are set; the remaining high bytes are cleared. */ wide_int -- 2.30.2