Hi!
These two PRs made me run aspell -c po/gcc.pot. Didn't want to spend too
much time, so I've been pressing I like crazy and therefore surely missed
lots of things, here is what I've noticed (which includes the two issues
filed in bugzilla):
containg -> containing
intructions -> instructions
outpoing -> outgoing
endianess -> endianness
signess -> signedness
caling -> calling
isnsns -> insns
occured -> occurred
instrumetnation -> instrumentation
byt -> but
vairant -> variant
invokation -> invocation
British English spellings:
recognised -> recognized
normalised -> normalized
initialisation -> initialization
After that I've diffed the gcc.pot and adjusted the original sources, plus
with the exception of the UK spellings also grepped other files in gcc/
subdir for similar typos and fixed them too. Some of the bugs were just
string literals split across multiple lines without space before " at the
end of one line and without space after " at the beginning of another line.
I'm not a native English speaker, so I'd appreciate corrections (e.g. not
100% sure about the endianess -> endianness). Bootstrapped/regtested on
x86_64-linux and i686-linux, ok for trunk?
2017-01-09 Jakub Jelinek <ja...@redhat.com>
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.
--- gcc/params.def.jj 2017-01-08 17:41:14.000000000 +0100
+++ gcc/params.def 2017-01-08 19:06:14.858050159 +0100
@@ -51,7 +51,7 @@ DEFPARAM (PARAM_PREDICTABLE_BRANCH_OUTCO
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_WIT
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)
--- gcc/config/avr/avr.opt.jj 2017-01-01 12:45:41.000000000 +0100
+++ gcc/config/avr/avr.opt 2017-01-08 19:07:21.171205829 +0100
@@ -76,7 +76,7 @@ Make the linker relaxation machine assum
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)
--- gcc/config/avr/avr.md.jj 2017-01-01 12:45:41.547628241 +0100
+++ gcc/config/avr/avr.md 2017-01-08 19:32:06.229286926 +0100
@@ -6284,7 +6284,7 @@ (define_insn "copysignsf3"
[(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)
--- gcc/config/s390/s390.c.jj 2017-01-05 11:43:11.000000000 +0100
+++ gcc/config/s390/s390.c 2017-01-08 19:06:43.303687993 +0100
@@ -15371,7 +15371,7 @@ s390_invalid_binary_op (int op ATTRIBUTE
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
--- gcc/config/sh/superh.h.jj 2017-01-01 12:45:41.695626284 +0100
+++ gcc/config/sh/superh.h 2017-01-08 19:32:11.553219080 +0100
@@ -20,7 +20,7 @@ along with GCC; see the file COPYING3.
/* 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
--- gcc/config/i386/i386.c.jj 2017-01-05 22:10:35.000000000 +0100
+++ gcc/config/i386/i386.c 2017-01-08 19:11:54.771720787 +0100
@@ -10390,7 +10390,7 @@ function_value_32 (machine_mode orig_mod
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");
--- gcc/config/i386/xopintrin.h.jj 2017-01-01 12:45:42.007622159 +0100
+++ gcc/config/i386/xopintrin.h 2017-01-08 19:21:44.043214822 +0100
@@ -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)
{
--- gcc/config/i386/znver1.md.jj 2017-01-01 12:45:42.218619370 +0100
+++ gcc/config/i386/znver1.md 2017-01-08 19:22:01.958986616 +0100
@@ -120,7 +120,7 @@ (define_insn_reservation "znver1_leave"
(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
--- gcc/config/nios2/nios2.c.jj 2017-01-01 12:45:42.000000000 +0100
+++ gcc/config/nios2/nios2.c 2017-01-08 19:14:55.757415445 +0100
@@ -3818,7 +3818,7 @@ nios2_valid_target_attribute_rec (tree a
}
else
{
- error ("%<custom-%s=%> is not recognised as FPU instruction",
+ error ("%<custom-%s=%> is not recognized as FPU instruction",
argstr + 7);
return false;
}
--- gcc/config/msp430/msp430.c.jj 2017-01-01 12:45:42.000000000 +0100
+++ gcc/config/msp430/msp430.c 2017-01-08 19:14:06.352044756 +0100
@@ -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;
--- gcc/config/msp430/msp430.opt.jj 2016-06-16 21:00:09.000000000 +0200
+++ gcc/config/msp430/msp430.opt 2017-01-08 19:07:56.734752831 +0100
@@ -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)
--- gcc/config/msp430/driver-msp430.c.jj 2017-01-01 12:45:42.000000000
+0100
+++ gcc/config/msp430/driver-msp430.c 2017-01-08 19:12:29.010284667 +0100
@@ -684,7 +684,7 @@ msp430_select_hwmult_lib (int argc ATTRI
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;
}
--- gcc/config/rs6000/rs6000-c.c.jj 2017-01-01 12:45:43.000000000 +0100
+++ gcc/config/rs6000/rs6000-c.c 2017-01-08 19:15:27.790007423 +0100
@@ -6000,7 +6000,7 @@ altivec_resolve_overloaded_builtin (loca
{
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));
--- gcc/config/rs6000/rs6000.c.jj 2017-01-05 11:43:12.299432886 +0100
+++ gcc/config/rs6000/rs6000.c 2017-01-08 19:32:20.414106161 +0100
@@ -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 {
--- gcc/cif-code.def.jj 2017-01-01 12:45:38.000000000 +0100
+++ gcc/cif-code.def 2017-01-08 19:04:10.767630061 +0100
@@ -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"))
--- gcc/cp/semantics.c.jj 2017-01-01 12:45:44.000000000 +0100
+++ gcc/cp/semantics.c 2017-01-08 19:16:37.886114560 +0100
@@ -6221,7 +6221,7 @@ finish_omp_clauses (tree clauses, enum c
&& t != integer_minus_one_node)
{
warning_at (OMP_CLAUSE_LOCATION (c), 0,
- "%<gang%> static value must be"
+ "%<gang%> static value must be "
"positive");
t = integer_one_node;
}
@@ -6288,12 +6288,12 @@ finish_omp_clauses (tree clauses, enum c
break;
case OMP_CLAUSE_VECTOR:
warning_at (OMP_CLAUSE_LOCATION (c), 0,
- "%<vector%> length value must be"
+ "%<vector%> length value must be "
"positive");
break;
case OMP_CLAUSE_WORKER:
warning_at (OMP_CLAUSE_LOCATION (c), 0,
- "%<worker%> num value must be"
+ "%<worker%> num value must be "
"positive");
break;
default:
@@ -7048,7 +7048,7 @@ finish_omp_clauses (tree clauses, enum c
&& 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;
--- gcc/cp/cp-cilkplus.c.jj 2017-01-01 12:45:44.565588341 +0100
+++ gcc/cp/cp-cilkplus.c 2017-01-08 19:26:55.413247825 +0100
@@ -137,7 +137,7 @@ cilk_cp_detect_spawn_and_unwrap (tree *e
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)
--- gcc/ipa-inline-analysis.c.jj 2017-01-01 12:45:37.000000000 +0100
+++ gcc/ipa-inline-analysis.c 2017-01-08 19:24:50.922834275 +0100
@@ -2967,7 +2967,7 @@ compute_inline_parameters (struct cgraph
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;
--- gcc/double-int.c.jj 2017-01-01 12:45:37.731678690 +0100
+++ gcc/double-int.c 2017-01-08 19:32:29.206994109 +0100
@@ -614,7 +614,7 @@ div_and_round_double (unsigned code, int
/* 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
--- gcc/symtab.c.jj 2017-01-06 19:34:22.000000000 +0100
+++ gcc/symtab.c 2017-01-08 19:10:31.456782028 +0100
@@ -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)
--- gcc/opts.c.jj 2017-01-01 12:45:39.000000000 +0100
+++ gcc/opts.c 2017-01-08 19:10:17.463960265 +0100
@@ -2449,7 +2449,7 @@ set_debug_level (enum debug_info_type ty
{
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
--- gcc/tree.c.jj 2017-01-01 12:45:39.000000000 +0100
+++ gcc/tree.c 2017-01-08 19:26:14.533768775 +0100
@@ -13320,7 +13320,7 @@ verify_type_variant (const_tree t, tree
- 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
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));
--- gcc/wide-int.cc.jj 2017-01-01 12:45:39.675652989 +0100
+++ gcc/wide-int.cc 2017-01-08 19:32:33.053945085 +0100
@@ -151,7 +151,7 @@ wi::from_array (HOST_WIDE_INT *val, cons
}
/* 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
--- gcc/tree-ssa.c.jj 2017-01-01 12:45:37.379683344 +0100
+++ gcc/tree-ssa.c 2017-01-08 19:32:25.208045069 +0100
@@ -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))))
--- gcc/common.opt.jj 2017-01-08 17:41:19.000000000 +0100
+++ gcc/common.opt 2017-01-08 19:08:40.000201729 +0100
@@ -1262,7 +1262,7 @@ Suppress output of addresses in debuggin
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)
--- gcc/common/config/msp430/msp430-common.c.jj 2017-01-01 12:45:46.000000000
+0100
+++ gcc/common/config/msp430/msp430-common.c 2017-01-08 19:11:29.844038309
+0100
@@ -54,7 +54,7 @@ msp430_handle_option (struct gcc_options
}
else
{
- error ("unrecognised argument of -mcpu: %s", decoded->arg);
+ error ("unrecognized argument of -mcpu: %s", decoded->arg);
return false;
}
break;
--- gcc/c-family/c.opt.jj 2017-01-06 09:23:31.000000000 +0100
+++ gcc/c-family/c.opt 2017-01-08 19:08:56.763988197 +0100
@@ -793,7 +793,7 @@ C ObjC C++ ObjC++ Warning Alias(Wnormali
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=<none|id|nfc|nfkc> Warn about non-normalised Unicode
strings.
+-Wnormalized=<none|id|nfc|nfkc> Warn about non-normalized Unicode
strings.
; Required for these enum values.
SourceInclude
--- gcc/double-int.h.jj 2017-01-01 12:45:35.124713156 +0100
+++ gcc/double-int.h 2017-01-08 19:32:02.167338690 +0100
@@ -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. */
--- gcc/cfgcleanup.c.jj 2017-01-01 12:45:38.536668048 +0100
+++ gcc/cfgcleanup.c 2017-01-08 19:27:22.899897548 +0100
@@ -60,7 +60,7 @@ along with GCC; see the file COPYING3.
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
}
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
--- gcc/doc/invoke.texi.jj 2017-01-08 17:41:16.000000000 +0100
+++ gcc/doc/invoke.texi 2017-01-08 19:20:45.231963942 +0100
@@ -10295,7 +10295,7 @@ Percentage penalty the recursive functio
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.
--- gcc/fortran/decl.c.jj 2017-01-01 12:45:47.000000000 +0100
+++ gcc/fortran/decl.c 2017-01-08 19:16:57.574863771 +0100
@@ -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;
}
--- gcc/fortran/intrinsic.texi.jj 2017-01-01 12:25:40.909509037 +0100
+++ gcc/fortran/intrinsic.texi 2017-01-08 19:29:23.637358924 +0100
@@ -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}:
--- gcc/fortran/lang.opt.jj 2017-01-01 12:45:47.000000000 +0100
+++ gcc/fortran/lang.opt 2017-01-08 19:09:41.316420701 +0100
@@ -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_c
-fconvert=<big-endian|little-endian|native|swap> 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)
--- gcc/fortran/openmp.c.jj 2017-01-01 12:45:47.000000000 +0100
+++ gcc/fortran/openmp.c 2017-01-08 19:17:44.731263106 +0100
@@ -3967,7 +3967,7 @@ resolve_omp_clauses (gfc_code *code, gfc
&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
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
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
--- gcc/lto/lto-symtab.c.jj 2017-01-01 12:45:48.022542637 +0100
+++ gcc/lto/lto-symtab.c 2017-01-08 19:27:49.367560256 +0100
@@ -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 <varpool_node *> (node))
&& DECL_HARD_REGISTER (vnode->decl)
&& (node2 = symtab_node::get (vnode->decl))
--- gcc/tree-ssa-sccvn.c.jj 2017-01-01 12:45:36.172699301 +0100
+++ gcc/tree-ssa-sccvn.c 2017-01-08 19:32:23.116071729 +0100
@@ -2024,7 +2024,7 @@ vn_reference_lookup_3 (ao_ref *ref, tree
/* ??? 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)
--- gcc/testsuite/c-c++-common/goacc/host_data-2.c.jj 2016-03-31
10:02:48.000000000 +0200
+++ gcc/testsuite/c-c++-common/goacc/host_data-2.c 2017-01-09
20:02:21.486219998 +0100
@@ -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 } */
}
--- gcc/testsuite/gfortran.dg/initialization_17.f90.jj 2008-09-05
12:55:19.000000000 +0200
+++ gcc/testsuite/gfortran.dg/initialization_17.f90 2017-01-09
20:01:05.934182187 +0100
@@ -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
Jakub
