On Tue, May 19, 2026 at 12:34 AM Jakub Jelinek <[email protected]> wrote: > > Hi! > > The PR mentions some typos. I've removed those which I saw also in > Dhruv's patchset, here is the rest. > > Bootstrapped/regtested on x86_64-linux and i686-linux, ok for trunk? > > 2026-05-19 Jakub Jelinek <[email protected]> > > PR other/125348 > gcc/ > * config/i386/i386-expand.cc (ix86_expand_builtin): Fix diagnostic > typo, forth -> fourth. > gcc/ada/ > * libgnat/s-regpat.ads: Fix comment spelling, paramter -> parameter. > gcc/m2/ > * gm2-compiler/M2GenGCC.mod (PerformLastForIterator): Fix diagnostic > typo, intemediate -> intermediate. > gcc/testsuite/ > * gcc.target/i386/pr117416-2.c (prefetch_test): Adjust expected > diagnostic spelling. > * gdc.test/compilable/dtoh_TemplateDeclaration.d: Fix comment > spelling, paramter -> parameter. > libffi/ > * src/x86/ffi.c (ffi_call_int, ffi_closure_inner): Fix comment > spelling, paramter -> parameter.
libffi has an upstream. And it is not fixed upstream yet either: https://github.com/libffi/libffi/blob/9760868682cc9a33008761f158d86481d56738aa/src/x86/ffi.c#L373 Everything else is ok. Thanks, Andrea > > --- gcc/ada/libgnat/s-regpat.ads.jj 2026-03-27 10:17:13.608339323 +0100 > +++ gcc/ada/libgnat/s-regpat.ads 2026-05-16 20:23:30.164756750 +0200 > @@ -428,7 +428,7 @@ package System.Regpat is > -- > -- This function raises Storage_Error if Matcher is too small to hold > -- the resulting code (i.e. Matcher.Size has too small a value) only when > - -- the paramter Error_When_Too_Small is set to True. Otherwise, no error > + -- the parameter Error_When_Too_Small is set to True. Otherwise, no error > -- will be raised and the required size will be placed in the > -- Final_Code_Size parameter. > -- > --- gcc/config/i386/i386-expand.cc.jj 2026-05-15 17:23:56.266095594 +0200 > +++ gcc/config/i386/i386-expand.cc 2026-05-16 20:21:01.854294555 +0200 > @@ -15243,7 +15243,7 @@ ix86_expand_builtin (tree exp, rtx targe > else > { > if (INTVAL (op3) != 0) > - warning (0, "invalid forth argument to" > + warning (0, "invalid fourth argument to" > " %<__builtin_ia32_prefetch%>; using zero"); > > if (!address_operand (op0, VOIDmode)) > --- gcc/m2/gm2-compiler/M2GenGCC.mod.jj 2026-04-14 21:13:35.036460768 +0200 > +++ gcc/m2/gm2-compiler/M2GenGCC.mod 2026-05-16 20:22:33.093733316 +0200 > @@ -566,7 +566,7 @@ BEGIN > IF TreeOverflow (incrtree) > THEN > MetaErrorT0 (lastpos, > - 'the intemediate calculation for the last iterator > value in the {%kFOR} loop has caused an overflow') ; > + 'the intermediate calculation for the last iterator > value in the {%kFOR} loop has caused an overflow') ; > NoChange := FALSE ; > SubQuad (quad) ; > success := FALSE > @@ -585,7 +585,7 @@ BEGIN > IF TreeOverflow (incrtree) > THEN > MetaErrorT0 (lastpos, > - 'the intemediate calculation for the last iterator > value in the {%kFOR} loop has caused an overflow') ; > + 'the intermediate calculation for the last iterator > value in the {%kFOR} loop has caused an overflow') ; > NoChange := FALSE ; > SubQuad (quad) ; > success := FALSE > --- gcc/testsuite/gcc.target/i386/pr117416-2.c.jj 2026-03-27 > 10:17:18.889253146 +0100 > +++ gcc/testsuite/gcc.target/i386/pr117416-2.c 2026-05-16 20:21:26.989864447 > +0200 > @@ -9,5 +9,5 @@ void* p; > void extern > prefetch_test (void) > { > - __builtin_ia32_prefetch (p, 0, 0, 2); /* { dg-warning "invalid forth > argument to '__builtin_ia32_prefetch'; using zero" } */ > + __builtin_ia32_prefetch (p, 0, 0, 2); /* { dg-warning "invalid fourth > argument to '__builtin_ia32_prefetch'; using zero" } */ > } > --- gcc/testsuite/gdc.test/compilable/dtoh_TemplateDeclaration.d.jj > 2026-03-27 10:17:20.110233222 +0100 > +++ gcc/testsuite/gdc.test/compilable/dtoh_TemplateDeclaration.d > 2026-05-16 20:26:46.414398641 +0200 > @@ -336,7 +336,7 @@ struct NotAA(T) > T[foo(1)] calcBuffer; > } > > -// Same name but hidden by the template paramter > +// Same name but hidden by the template parameter > extern (D) struct Buffer {} > extern (D) struct ActualBuffer {} > > --- libffi/src/x86/ffi.c.jj 2026-03-27 10:17:21.601208891 +0100 > +++ libffi/src/x86/ffi.c 2026-05-16 20:27:09.308006903 +0200 > @@ -360,7 +360,7 @@ ffi_call_int (ffi_cif *cif, void (*fn)(v > size_t za = FFI_ALIGN (z, FFI_SIZEOF_ARG); > size_t align = FFI_SIZEOF_ARG; > > - /* Issue 434: For thiscall and fastcall, if the paramter passed > + /* Issue 434: For thiscall and fastcall, if the parameter passed > as 64-bit integer or struct, all following integer parameters > will be passed on stack. */ > if ((cabi == FFI_THISCALL || cabi == FFI_FASTCALL) > @@ -509,7 +509,7 @@ ffi_closure_inner (struct closure_frame > if (t == FFI_TYPE_STRUCT && ty->alignment >= 16) > align = 16; > > - /* Issue 434: For thiscall and fastcall, if the paramter passed > + /* Issue 434: For thiscall and fastcall, if the parameter passed > as 64-bit integer or struct, all following integer parameters > will be passed on stack. */ > if ((cabi == FFI_THISCALL || cabi == FFI_FASTCALL) > > Jakub >
